Skip to content

[6.32] Backport fix of argument-passing conventions for hbook #22573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hageboeck wants to merge 2 commits into
base: v6-32-00-patches
Choose a base branch
from
+7 −11
Open

[6.32] Backport fix of argument-passing conventions for hbook #22573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
575fa7d
Fix argument passing conventions in h2root.
hageboeck Feb 27, 2026
ed8a5dd
Fix argument passing conventions in THbookFile.
hageboeck Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions hist/hbook/src/THbookFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,7 @@ static Int_t gLastEntry = -1;

// As recommended in
// https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html
#if __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
#endif
using fortran_charlen_t = size_t;

#else
# define hlimit HLIMIT
Expand Down
12 changes: 6 additions & 6 deletions main/src/h2root.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ void MAIN__() {}

// As recommended in
// https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html
#if __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
#endif
using fortran_charlen_t = size_t;

#else
# define hlimit HLIMIT
Expand Down Expand Up @@ -329,7 +325,11 @@ int main(int argc, char **argv)

int lun = 10;
#ifndef WIN32
hropen(lun,PASSCHAR("example"),PASSCHAR(file_in),PASSCHAR("px"),record_size,ier,7,strlen(file_in),2);
// Reminder: Argument passing convention is that string lengths go as hidden arguments
// at the end of the argument list.
constexpr auto chdir = "example";
constexpr auto opt = "px";
hropen(lun, chdir, file_in, opt, record_size, ier, strlen(chdir), strlen(file_in), strlen(opt));
#else
hropen(lun,PASSCHAR("example"),PASSCHAR(file_in),PASSCHAR("px"),record_size,ier);
#endif
Expand Down
Loading