Diff of the two buildlogs:

--
--- b1/build.log	2023-04-12 10:51:51.010809120 +0000
+++ b2/build.log	2023-04-12 10:53:31.835475185 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Tue Apr 11 22:50:20 -12 2023
-I: pbuilder-time-stamp: 1681296620
+I: Current time: Wed May 15 07:14:55 +14 2024
+I: pbuilder-time-stamp: 1715706895
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/bookworm-reproducible-base.tgz]
 I: copying local configuration
@@ -16,7 +16,7 @@
 I: copying [./hdf-eos4_2.20v1.00.orig.tar.xz]
 I: copying [./hdf-eos4_2.20v1.00-1.debian.tar.xz]
 I: Extracting source
-gpgv: Signature made Fri Jun  1 21:44:08 2018 -12
+gpgv: Signature made Sat Jun  2 23:44:08 2018 +14
 gpgv:                using RSA key 82383CE9165B347C787081A2CBE6BB4E5D9AD3A5
 gpgv: Can't check signature: No public key
 dpkg-source: warning: cannot verify inline signature for ./hdf-eos4_2.20v1.00-1.dsc: no acceptable signature found
@@ -34,11 +34,20 @@
 dpkg-source: info: applying hdfalt.patch
 I: using fakeroot in build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/25136/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink15-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+lrwxrwxrwx 1 root root 4 Jan  6  2023 /bin/sh -> dash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/D02_print_environment starting
 I: set
   BUILDDIR='/build'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME='pbuilder2'
   BUILD_ARCH='arm64'
   DEBIAN_FRONTEND='noninteractive'
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=8'
@@ -48,38 +57,38 @@
   IFS=' 	
   '
   LANG='C'
-  LANGUAGE='en_US:en'
+  LANGUAGE='nl_BE:nl'
   LC_ALL='C'
   MAIL='/var/mail/root'
   OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
+  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path'
   PBCURRENTCOMMANDLINEOPERATION='build'
   PBUILDER_OPERATION='build'
   PBUILDER_PKGDATADIR='/usr/share/pbuilder'
   PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
   PBUILDER_SYSCONFDIR='/etc'
-  PPID='25136'
+  PPID='29998'
   PS1='# '
   PS2='> '
   PS4='+ '
   PWD='/'
   SHELL='/bin/bash'
   SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.CIQ2XiB8/pbuilderrc_rLts --distribution bookworm --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.CIQ2XiB8/b1 --logfile b1/build.log hdf-eos4_2.20v1.00-1.dsc'
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.CIQ2XiB8/pbuilderrc_zLEG --distribution bookworm --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/bookworm-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.CIQ2XiB8/b2 --logfile b2/build.log --extrapackages usrmerge hdf-eos4_2.20v1.00-1.dsc'
   SUDO_GID='117'
   SUDO_UID='110'
   SUDO_USER='jenkins'
   TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
+  TZ='/usr/share/zoneinfo/Etc/GMT-14'
   USER='root'
   USERNAME='root'
   _='/usr/bin/systemd-run'
   http_proxy='http://192.168.101.16:3128'
 I: uname -a
-  Linux codethink16-arm64 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux
+  Linux i-capture-the-hostname 4.15.0-208-generic #220-Ubuntu SMP Mon Mar 20 14:28:12 UTC 2023 aarch64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Apr 10 22:26 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/25136/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 May 13 06:47 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -198,7 +207,7 @@
 Get: 69 http://deb.debian.org/debian bookworm/main arm64 libxml2-dev arm64 2.9.14+dfsg-1.1+b3 [740 kB]
 Get: 70 http://deb.debian.org/debian bookworm/main arm64 libnetcdf-dev arm64 1:4.9.0-3+b1 [113 kB]
 Get: 71 http://deb.debian.org/debian bookworm/main arm64 libhdf4-alt-dev arm64 4.2.15-5 [368 kB]
-Fetched 50.1 MB in 1s (37.6 MB/s)
+Fetched 50.1 MB in 1s (59.8 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package sensible-utils.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19616 files and directories currently installed.)
@@ -502,10 +511,15 @@
 Reading package lists...
 Building dependency tree...
 Reading state information...
+usrmerge is already the newest version (35).
 fakeroot is already the newest version (1.31-1.2).
 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
 I: Building the package
-I: Running cd /build/hdf-eos4-2.20v1.00/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../hdf-eos4_2.20v1.00-1_source.changes
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/A99_set_merged_usr starting
+Re-configuring usrmerge...
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/A99_set_merged_usr finished
+hostname: Temporary failure in name resolution
+I: Running cd /build/hdf-eos4-2.20v1.00/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../hdf-eos4_2.20v1.00-1_source.changes
 dpkg-buildpackage: info: source package hdf-eos4
 dpkg-buildpackage: info: source version 2.20v1.00-1
 dpkg-buildpackage: info: source distribution unstable
@@ -829,9 +843,9 @@
 /bin/sh ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include -I../include/  -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf  -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c -o PTapi.lo PTapi.c
 /bin/sh ../libtool  --tag=CC   --mode=compile gcc -DHAVE_CONFIG_H -I. -I../include -I../include/  -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf  -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c -o SWapi.lo SWapi.c
 libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c GDapi.c  -fPIC -DPIC -o .libs/GDapi.o
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c EHapi.c  -fPIC -DPIC -o .libs/EHapi.o
-libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c PTapi.c  -fPIC -DPIC -o .libs/PTapi.o
 libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c SWapi.c  -fPIC -DPIC -o .libs/SWapi.o
+libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c PTapi.c  -fPIC -DPIC -o .libs/PTapi.o
+libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../include -I../include/ -Wdate-time -D_FORTIFY_SOURCE=2 -Df2cFortran -I/usr/include/hdf -g -O2 -ffile-prefix-map=/build/hdf-eos4-2.20v1.00=. -fstack-protector-strong -Wformat -Werror=format-security -c EHapi.c  -fPIC -DPIC -o .libs/EHapi.o
 PTapi.c: In function 'PTsizeof':
 PTapi.c:714:32: warning: passing argument 1 of 'EHparsestr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
   714 |             nflds = EHparsestr(fieldlist, ',', pntr, slen);
@@ -894,6 +908,14 @@
 EHapi.c:649:45: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
   649 | EHidinfo(int32 fid, int32 * HDFfid, int32 * sdInterfaceID)
       |                                     ~~~~~~~~^~~~~~~~~~~~~
+SWapi.c: In function 'SWdefinefield':
+SWapi.c:4120:39: warning: passing argument 1 of 'EHparsestr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
+ 4120 |                     rank = EHparsestr(dimlist, ',', ptr, slen);
+      |                                       ^~~~~~~
+In file included from SWapi.c:79:
+../include/HdfEosDef.h:295:18: note: expected 'char *' but argument is of type 'const char *'
+  295 | int32 EHparsestr(char *, char, char *[], int32 []);
+      |                  ^~~~~~
 PTapi.c: In function 'PTreadlevel':
 PTapi.c:3586:34: warning: passing argument 1 of 'EHparsestr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
  3586 |             nfields = EHparsestr(fieldlist, ',', pntr, slen);
@@ -901,16 +923,8 @@
 ../include/HdfEosDef.h:295:18: note: expected 'char *' but argument is of type 'const char *'
   295 | int32 EHparsestr(char *, char, char *[], int32 []);
       |                  ^~~~~~
-SWapi.c: In function 'SWdefinefield':
 In file included from PTapi.c:22:
 PTapi.c: In function 'ptsizeof_':
-SWapi.c:4120:39: warning: passing argument 1 of 'EHparsestr' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
- 4120 |                     rank = EHparsestr(dimlist, ',', ptr, slen);
-      |                                       ^~~~~~~
-In file included from SWapi.c:79:
-../include/HdfEosDef.h:295:18: note: expected 'char *' but argument is of type 'const char *'
-  295 | int32 EHparsestr(char *, char, char *[], int32 []);
-      |                  ^~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTsizeof' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1106,185 +1120,9 @@
 PTapi.c:3521:31: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  3521 |             int32 nrec, int32 recs[], VOIDP datbuf)
       |                         ~~~~~~^~~~~~
-PTapi.c: In function 'ptinqpoint_':
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTinqpoint' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                     ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
- 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
-      |         ^~~~~~~~~~~
-PTapi.c:6171:1: note: in expansion of macro 'FCALLSCFUN3'
- 6171 | FCALLSCFUN3(INT32, PTinqpoint, PTINQPOINT, ptinqpoint, STRING, PSTRING,
-      | ^~~~~~~~~~~
-PTapi.c:2288:53: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 2288 | PTinqpoint(char *filename, char *pointlist, int32 * strbufsize)
-      |                                             ~~~~~~~~^~~~~~~~~~
-PTapi.c: In function 'ptattrinfo_':
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                     ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
-      |         ^~~~~~~~~~~
-PTapi.c:6173:1: note: in expansion of macro 'FCALLSCFUN4'
- 6173 | FCALLSCFUN4(INT, PTattrinfo, PTATTRINFO, ptattrinfo, INT32, STRING,
-      | ^~~~~~~~~~~
-PTapi.c:4342:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4342 | PTattrinfo(int32 pointID, char *attrname, int32 * numbertype, int32 * count)
-      |                                           ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
-      |         ^~~~~~~~~~~
-PTapi.c:6173:1: note: in expansion of macro 'FCALLSCFUN4'
- 6173 | FCALLSCFUN4(INT, PTattrinfo, PTATTRINFO, ptattrinfo, INT32, STRING,
-      | ^~~~~~~~~~~
-PTapi.c:4342:71: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4342 | PTattrinfo(int32 pointID, char *attrname, int32 * numbertype, int32 * count)
-      |                                                               ~~~~~~~~^~~~~
-PTapi.c: In function 'ptinqattrs_':
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                     ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
- 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
-      |         ^~~~~~~~~~~
-PTapi.c:6175:1: note: in expansion of macro 'FCALLSCFUN3'
- 6175 | FCALLSCFUN3(INT32, PTinqattrs, PTINQATTRS, ptinqattrs, INT32, PSTRING,
-      | ^~~~~~~~~~~
-PTapi.c:4402:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4402 | PTinqattrs(int32 pointID, char *attrnames, int32 * strbufsize)
-      |                                            ~~~~~~~~^~~~~~~~~~
-PTapi.c: In function 'ptgetrecnums_':
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
- 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
- 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
-      | ^~~~~~~~~~~
-PTapi.c:4092:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
-      |                            ~~~~~~^~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 6 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1753:22: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |                      ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
- 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
- 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
-      | ^~~~~~~~~~~
-PTapi.c:4092:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
-      |                                            ~~~~~~~~^~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 7 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1753:37: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |                                     ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
- 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
- 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
-      | ^~~~~~~~~~~
-PTapi.c:4092:67: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
-      |                                                             ~~~~~~^~~~~~~~~
 In file included from GDapi.c:93:
 GDapi.c: In function 'gdwrfld_':
+PTapi.c: In function 'ptinqpoint_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1328,7 +1166,6 @@
 GDapi.c:14292:1: note: in expansion of macro 'FCALLSCFUN6'
 14292 | FCALLSCFUN6(INT, GDwrfld, GDWRFLD, gdwrfld, INT32, STRING, INT32V,
       | ^~~~~~~~~~~
-PTapi.c: In function 'ptgetlevname_':
 GDapi.c:6215:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6215 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
       |                            ~~~~~~^~~~~~~~~~~~
@@ -1355,7 +1192,7 @@
 GDapi.c:6215:54: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6215 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
       |                                                ~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTgetlevelname' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTinqpoint' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1363,24 +1200,24 @@
 ../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
  1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
+      |                                                     ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
  1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
       |         ^~~~~~~~~~~
-PTapi.c:6179:1: note: in expansion of macro 'FCALLSCFUN4'
- 6179 | FCALLSCFUN4(INT, PTgetlevelname, PTGETLEVNAME, ptgetlevname, INT32,
+PTapi.c:6171:1: note: in expansion of macro 'FCALLSCFUN3'
+ 6171 | FCALLSCFUN3(INT32, PTinqpoint, PTINQPOINT, ptinqpoint, STRING, PSTRING,
       | ^~~~~~~~~~~
-PTapi.c:1006:69: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 1006 | PTgetlevelname(int32 pointID, int32 level, char *levelname, int32 * strbufsize)
-      |                                                             ~~~~~~~~^~~~~~~~~~
+PTapi.c:2288:53: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 2288 | PTinqpoint(char *filename, char *pointlist, int32 * strbufsize)
+      |                                             ~~~~~~~~^~~~~~~~~~
 GDapi.c: In function 'gdrdfld_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -1405,6 +1242,7 @@
 GDapi.c:6318:46: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6318 | GDrdfld(int32 gridID, char *fieldname, int32 fortstart[],
       |                                        ~~~~~~^~~~~~~~~~~
+PTapi.c: In function 'ptattrinfo_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1451,8 +1289,7 @@
 GDapi.c:6319:35: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6319 |         int32 fortstride[], int32 fortedge[], VOIDP buffer)
       |                             ~~~~~~^~~~~~~~~~
-PTapi.c: In function 'ptreginfo_':
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTregioninfo' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1460,21 +1297,51 @@
 ../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
  1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
+../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                     ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
  1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-PTapi.c:6183:1: note: in expansion of macro 'FCALLSCFUN5'
- 6183 | FCALLSCFUN5(INT, PTregioninfo, PTREGINFO, ptreginfo, INT32, INT32,
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+      |         ^~~~~~~~~~~
+PTapi.c:6173:1: note: in expansion of macro 'FCALLSCFUN4'
+ 6173 | FCALLSCFUN4(INT, PTattrinfo, PTATTRINFO, ptattrinfo, INT32, STRING,
       | ^~~~~~~~~~~
-PTapi.c:5061:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5061 |              int32 * size)
-      |              ~~~~~~~~^~~~
+PTapi.c:4342:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4342 | PTattrinfo(int32 pointID, char *attrname, int32 * numbertype, int32 * count)
+      |                                           ~~~~~~~~^~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                                    ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+      |         ^~~~~~~~~~~
+PTapi.c:6173:1: note: in expansion of macro 'FCALLSCFUN4'
+ 6173 | FCALLSCFUN4(INT, PTattrinfo, PTATTRINFO, ptattrinfo, INT32, STRING,
+      | ^~~~~~~~~~~
+PTapi.c:4342:71: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4342 | PTattrinfo(int32 pointID, char *attrname, int32 * numbertype, int32 * count)
+      |                                                               ~~~~~~~~^~~~~
+PTapi.c: In function 'ptinqattrs_':
 GDapi.c: In function 'gdattrinfo_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -1528,9 +1395,7 @@
 GDapi.c:6575:70: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6575 | GDattrinfo(int32 gridID, char *attrname, int32 * numbertype, int32 * count)
       |                                                              ~~~~~~~~^~~~~
-GDapi.c: In function 'gdinqattrs_':
-PTapi.c: In function 'ptperinfo_':
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'PTinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1550,13 +1415,11 @@
 ../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
  1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
       |         ^~~~~~~~~~~
-GDapi.c:14303:1: note: in expansion of macro 'FCALLSCFUN3'
-14303 | FCALLSCFUN3(INT32, GDinqattrs, GDINQATTRS, gdinqattrs, INT32, PSTRING,
+PTapi.c:6175:1: note: in expansion of macro 'FCALLSCFUN3'
+ 6175 | FCALLSCFUN3(INT32, PTinqattrs, PTINQATTRS, ptinqattrs, INT32, PSTRING,
       | ^~~~~~~~~~~
-GDapi.c:6636:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 6636 | GDinqattrs(int32 gridID, char *attrnames, int32 * strbufsize)
-      |                                           ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTperiodinfo' from incompatible pointer type [-Wincompatible-pointer-types]
+GDapi.c: In function 'gdinqattrs_':
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1564,18 +1427,27 @@
 ../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
  1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
+../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                     ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
  1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-PTapi.c:6191:1: note: in expansion of macro 'FCALLSCFUN5'
- 6191 | FCALLSCFUN5(INT, PTperiodinfo, PTPERINFO, ptperinfo, INT32, INT32,
+../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
+      |         ^~~~~~~~~~~
+GDapi.c:14303:1: note: in expansion of macro 'FCALLSCFUN3'
+14303 | FCALLSCFUN3(INT32, GDinqattrs, GDINQATTRS, gdinqattrs, INT32, PSTRING,
       | ^~~~~~~~~~~
+GDapi.c:6636:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 6636 | GDinqattrs(int32 gridID, char *attrnames, int32 * strbufsize)
+      |                                           ~~~~~~~~^~~~~~~~~~
+PTapi.c:4402:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4402 | PTinqattrs(int32 pointID, char *attrnames, int32 * strbufsize)
+      |                                            ~~~~~~~~^~~~~~~~~~
 GDapi.c: In function 'gdinqdims_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDinqdims' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -1600,13 +1472,31 @@
 GDapi.c:14305:1: note: in expansion of macro 'FCALLSCFUN3'
 14305 | FCALLSCFUN3(INT32, GDinqdims, GDINQDIMS, gdinqdims, INT32, PSTRING,
       | ^~~~~~~~~~~
+PTapi.c: In function 'ptgetrecnums_':
 GDapi.c:6705:47: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6705 | GDinqdims(int32 gridID, char *dimnames, int32 dims[])
       |                                         ~~~~~~^~~~~~
-PTapi.c:5195:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5195 |              int32 * size)
-      |              ~~~~~~~~^~~~
 GDapi.c: In function 'gdinqflds_':
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
+ 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
+      | ^~~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDinqfields' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1633,8 +1523,6 @@
 GDapi.c:6859:50: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6859 | GDinqfields(int32 gridID, char *fieldlist, int32 rank[],
       |                                            ~~~~~~^~~~~~
-In file included from SWapi.c:78:
-SWapi.c: In function 'swdefimap_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDinqfields' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1661,8 +1549,10 @@
 GDapi.c:6860:19: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  6860 |             int32 numbertype[])
       |             ~~~~~~^~~~~~~~~~~~
-PTapi.c: In function 'ptregrecs_':
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTregionrecs' from incompatible pointer type [-Wincompatible-pointer-types]
+PTapi.c:4092:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
+      |                            ~~~~~~^~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 6 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1670,45 +1560,22 @@
 ../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
  1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
+../include/cfortHdf.h:1753:22: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |                      ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-PTapi.c:6195:1: note: in expansion of macro 'FCALLSCFUN5'
- 6195 | FCALLSCFUN5(INT, PTregionrecs, PTREGRECS, ptregrecs, INT32, INT32,
+PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
+ 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
       | ^~~~~~~~~~~
 GDapi.c: In function 'gdinqgrid_':
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWdefidxmap' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
-      |         ^~~~~~~~~~~
-SWapi.c:14537:1: note: in expansion of macro 'FCALLSCFUN4'
-14537 | FCALLSCFUN4(INT, SWdefidxmap, SWDEFIMAP, swdefimap, INT32, STRING, STRING,
-      | ^~~~~~~~~~~
-SWapi.c:3363:75: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 3363 | SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_index[])
-      |                                                                     ~~~~~~^~~~~~~~~
+PTapi.c:4092:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
+      |                                            ~~~~~~~~^~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDinqgrid' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1735,9 +1602,26 @@
 GDapi.c:7251:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  7251 | GDinqgrid(char *filename, char *gridlist, int32 * strbufsize)
       |                                           ~~~~~~~~^~~~~~~~~~
-PTapi.c:5242:66: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5242 | PTregionrecs(int32 pointID, int32 regionID, int32 level, int32 * nrec,
-      |                                                          ~~~~~~~~^~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 7 of 'PTgetrecnums' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:37: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |                                     ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1722:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1722 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6177:1: note: in expansion of macro 'FCALLSCFUN7'
+ 6177 | FCALLSCFUN7(INT, PTgetrecnums, PTGETRECNUMS, ptgetrecnums, INT32, INT32,
+      | ^~~~~~~~~~~
 GDapi.c: In function 'gdnentries_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDnentries' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -1765,30 +1649,11 @@
 GDapi.c:7073:51: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  7073 | GDnentries(int32 gridID, int32 entrycode, int32 * strbufsize)
       |                                           ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTregionrecs' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-PTapi.c:6195:1: note: in expansion of macro 'FCALLSCFUN5'
- 6195 | FCALLSCFUN5(INT, PTregionrecs, PTREGRECS, ptregrecs, INT32, INT32,
-      | ^~~~~~~~~~~
-PTapi.c:5243:20: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5243 |              int32 recs[])
-      |              ~~~~~~^~~~~~
+PTapi.c:4092:67: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4092 |              int32 inNrec, int32 inRecs[], int32 * outNrec, int32 outRecs[])
+      |                                                             ~~~~~~^~~~~~~~~
 GDapi.c: In function 'gdgridinfo_':
+PTapi.c: In function 'ptgetlevname_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 2 of 'GDgridinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1812,7 +1677,6 @@
 GDapi.c:1812:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  1812 | GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
       |                          ~~~~~~~~^~~~~~~~
-PTapi.c: In function 'ptperrecs_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDgridinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1836,7 +1700,7 @@
 GDapi.c:1812:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  1812 | GDgridinfo(int32 gridID, int32 * xdimsize, int32 * ydimsize,
       |                                            ~~~~~~~~^~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTperiodrecs' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTgetlevelname' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -1853,9 +1717,15 @@
 ../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
  1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-PTapi.c:6197:1: note: in expansion of macro 'FCALLSCFUN5'
- 6197 | FCALLSCFUN5(INT, PTperiodrecs, PTPERRECS, ptperrecs, INT32, INT32,
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+      |         ^~~~~~~~~~~
+PTapi.c:6179:1: note: in expansion of macro 'FCALLSCFUN4'
+ 6179 | FCALLSCFUN4(INT, PTgetlevelname, PTGETLEVNAME, ptgetlevname, INT32,
       | ^~~~~~~~~~~
+PTapi.c:1006:69: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 1006 | PTgetlevelname(int32 pointID, int32 level, char *levelname, int32 * strbufsize)
+      |                                                             ~~~~~~~~^~~~~~~~~~
 GDapi.c: In function 'gdprojinfo_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 2 of 'GDprojinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -1926,31 +1796,10 @@
 GDapi.c:2003:20: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  2003 |            int32 * spherecode, float64 projparm[])
       |            ~~~~~~~~^~~~~~~~~~
-PTapi.c:5339:66: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5339 | PTperiodrecs(int32 pointID, int32 periodID, int32 level, int32 * nrec,
-      |                                                          ~~~~~~~~^~~~
-SWapi.c: In function 'swwrfld_':
+PTapi.c: In function 'ptreginfo_':
+In file included from SWapi.c:78:
+SWapi.c: In function 'swdefimap_':
 GDapi.c: In function 'gdfldinfo_':
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTperiodrecs' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-PTapi.c:6197:1: note: in expansion of macro 'FCALLSCFUN5'
- 6197 | FCALLSCFUN5(INT, PTperiodrecs, PTPERRECS, ptperrecs, INT32, INT32,
-      | ^~~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDfldinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -1974,6 +1823,26 @@
 GDapi.c:3112:56: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  3112 | GDfldinfo(int32 gridID, const char *fieldname, int32 * rank, int32 dims[],
       |                                                ~~~~~~~~^~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTregioninfo' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6183:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6183 | FCALLSCFUN5(INT, PTregioninfo, PTREGINFO, ptreginfo, INT32, INT32,
+      | ^~~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDfldinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2020,7 +1889,10 @@
 GDapi.c:3113:19: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  3113 |           int32 * numbertype, char *fortdimlist)
       |           ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
+PTapi.c:5061:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5061 |              int32 * size)
+      |              ~~~~~~~~^~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWdefidxmap' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2028,24 +1900,24 @@
 ../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
  1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                     ^~~
+      |                                                                    ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
-14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+      |         ^~~~~~~~~~~
+SWapi.c:14537:1: note: in expansion of macro 'FCALLSCFUN4'
+14537 | FCALLSCFUN4(INT, SWdefidxmap, SWDEFIMAP, swdefimap, INT32, STRING, STRING,
       | ^~~~~~~~~~~
-PTapi.c:5340:20: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5340 |              int32 recs[])
-      |              ~~~~~~^~~~~~
-SWapi.c:7170:15: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
-      |         ~~~~~~^~~~~~~~~~~
+SWapi.c:3363:75: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 3363 | SWdefidxmap(int32 swathID, const char *geodim, const char *datadim, int32 l_index[])
+      |                                                                     ~~~~~~^~~~~~~~~
 GDapi.c: In function 'gdorginfo_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 2 of 'GDorigininfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -2100,30 +1972,7 @@
 GDapi.c:2363:36: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  2363 | GDpixreginfo(int32 gridID, int32 * pixregcode)
       |                            ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
- 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
-      |                                                          ^
-      |                                                          |
-      |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
-      |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
- 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
-../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
- 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
-      |         ^~~~~~~~~~~~
-SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
-14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
-      | ^~~~~~~~~~~
 GDapi.c: In function 'gdcompinfo_':
-SWapi.c:7170:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
-      |                            ~~~~~~^~~~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDcompinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2150,13 +1999,14 @@
 GDapi.c:2489:57: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  2489 | GDcompinfo(int32 gridID, const char *fieldname, int32 * compcode, intn compparm[])
       |                                                 ~~~~~~~~^~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
+PTapi.c: In function 'ptperinfo_':
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTperiodinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
 ../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
  1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
@@ -2164,17 +2014,16 @@
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
-14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
+PTapi.c:6191:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6191 | FCALLSCFUN5(INT, PTperiodinfo, PTPERINFO, ptperinfo, INT32, INT32,
       | ^~~~~~~~~~~
-SWapi.c:7170:54: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
-      |                                                ~~~~~~^~~~~~~~~~
+PTapi.c:5195:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5195 |              int32 * size)
+      |              ~~~~~~~~^~~~
 GDapi.c: In function 'gdgetpix_':
-SWapi.c: In function 'swrdfld_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'GDgetpix' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2198,6 +2047,7 @@
 GDapi.c:12687:16: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
 12687 |          int32 fortpixRow[], int32 fortpixCol[])
       |          ~~~~~~^~~~~~~~~~~~
+SWapi.c: In function 'swwrfld_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 6 of 'GDgetpix' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2221,6 +2071,7 @@
 GDapi.c:12687:36: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
 12687 |          int32 fortpixRow[], int32 fortpixCol[])
       |                              ~~~~~~^~~~~~~~~~~~
+PTapi.c: In function 'ptregrecs_':
 GDapi.c: In function 'gdgetpixval_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDgetpixval' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -2242,7 +2093,10 @@
 GDapi.c:14334:1: note: in expansion of macro 'FCALLSCFUN6'
 14334 | FCALLSCFUN6(INT32, GDgetpixval, GDGETPIXVAL, gdgetpixval, INT32,
       | ^~~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
+GDapi.c:12749:48: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+12749 | GDgetpixval(int32 gridID, int32 nPixels, int32 fortpixRow[],
+      |                                          ~~~~~~^~~~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDgetpixval' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2250,28 +2104,28 @@
 ../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
  1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                     ^~~
+      |                                                                    ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
  1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
-14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
+GDapi.c:14334:1: note: in expansion of macro 'FCALLSCFUN6'
+14334 | FCALLSCFUN6(INT32, GDgetpixval, GDGETPIXVAL, gdgetpixval, INT32,
       | ^~~~~~~~~~~
-GDapi.c:12749:48: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
-12749 | GDgetpixval(int32 gridID, int32 nPixels, int32 fortpixRow[],
-      |                                          ~~~~~~^~~~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDgetpixval' from incompatible pointer type [-Wincompatible-pointer-types]
+GDapi.c:12750:19: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+12750 |             int32 fortpixCol[], char *fieldname, VOIDP buffer)
+      |             ~~~~~~^~~~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTregionrecs' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
 ../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
@@ -2279,20 +2133,13 @@
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-GDapi.c:14334:1: note: in expansion of macro 'FCALLSCFUN6'
-14334 | FCALLSCFUN6(INT32, GDgetpixval, GDGETPIXVAL, gdgetpixval, INT32,
+PTapi.c:6195:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6195 | FCALLSCFUN5(INT, PTregionrecs, PTREGRECS, ptregrecs, INT32, INT32,
       | ^~~~~~~~~~~
-GDapi.c:12750:19: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
-12750 |             int32 fortpixCol[], char *fieldname, VOIDP buffer)
-      |             ~~~~~~^~~~~~~~~~~~
-SWapi.c:7271:53: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7271 | SWrdfld(int32 swathID, const char *fieldname, int32 fortstart[],
-      |                                               ~~~~~~^~~~~~~~~~~
-GDapi.c: In function 'gdreginfo_':
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2300,17 +2147,44 @@
 ../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
  1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
-      |                                                                    ^~~
+      |                                                     ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
  1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
-14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
+SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
+14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
+      | ^~~~~~~~~~~
+PTapi.c:5242:66: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5242 | PTregionrecs(int32 pointID, int32 regionID, int32 level, int32 * nrec,
+      |                                                          ~~~~~~~~^~~~
+SWapi.c:7170:15: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
+      |         ~~~~~~^~~~~~~~~~~
+GDapi.c: In function 'gdreginfo_':
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTregionrecs' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6195:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6195 | FCALLSCFUN5(INT, PTregionrecs, PTREGRECS, ptregrecs, INT32, INT32,
       | ^~~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDreginfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -2404,10 +2278,7 @@
 GDapi.c:11303:62: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
 11303 |           int32 * ntype, int32 * rank, int32 dims[], int32 * size,
       |                                                      ~~~~~~~~^~~~
-SWapi.c:7272:15: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7272 |         int32 fortstride[], int32 fortedge[], VOIDP buffer)
-      |         ~~~~~~^~~~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2415,22 +2286,46 @@
 ../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
  1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                                    ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
 ../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
  1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
-14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
+SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
+14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
+      | ^~~~~~~~~~~
+PTapi.c:5243:20: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5243 |              int32 recs[])
+      |              ~~~~~~^~~~~~
+SWapi.c:7170:34: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
+      |                            ~~~~~~^~~~~~~~~~~~
+PTapi.c: In function 'ptperrecs_':
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'PTperiodrecs' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                                    ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6197:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6197 | FCALLSCFUN5(INT, PTperiodrecs, PTPERRECS, ptperrecs, INT32, INT32,
       | ^~~~~~~~~~~
 GDapi.c: In function 'gddeftle_':
-SWapi.c:7272:35: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 7272 |         int32 fortstride[], int32 fortedge[], VOIDP buffer)
-      |                             ~~~~~~^~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDdeftle' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2457,7 +2352,54 @@
 GDapi.c:1459:62: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  1459 | GDdeftle(int32 gridID, int32 tilecode, int32 tilerank, int32 forttiledims[])
       |                                                        ~~~~~~^~~~~~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'SWwrfld' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+SWapi.c:14548:1: note: in expansion of macro 'FCALLSCFUN6'
+14548 | FCALLSCFUN6(INT, SWwrfld, SWWRFLD, swwrfld, INT32, STRING, INT32V,
+      | ^~~~~~~~~~~
+PTapi.c:5339:66: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5339 | PTperiodrecs(int32 pointID, int32 periodID, int32 level, int32 * nrec,
+      |                                                          ~~~~~~~~^~~~
+SWapi.c:7170:54: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7170 |         int32 fortstart[], int32 fortstride[], int32 fortedge[], VOIDP data)
+      |                                                ~~~~~~^~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'PTperiodrecs' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+PTapi.c:6197:1: note: in expansion of macro 'FCALLSCFUN5'
+ 6197 | FCALLSCFUN5(INT, PTperiodrecs, PTPERRECS, ptperrecs, INT32, INT32,
+      | ^~~~~~~~~~~
 GDapi.c: In function 'gdtleinfo_':
+SWapi.c: In function 'swrdfld_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDtleinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2501,6 +2443,9 @@
 GDapi.c:14347:1: note: in expansion of macro 'FCALLSCFUN5'
 14347 | FCALLSCFUN5(INT, GDtleinfo, GDTLEINFO, gdtleinfo, INT32, STRING, PINT32,
       | ^~~~~~~~~~~
+PTapi.c:5340:20: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5340 |              int32 recs[])
+      |              ~~~~~~^~~~~~
 GDapi.c:13462:68: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
 13462 | GDtleinfo(int32 gridID, char *fieldname, int32 * tilecode, int32 * tilerank,
       |                                                            ~~~~~~~~^~~~~~~~
@@ -2554,9 +2499,7 @@
 GDapi.c:13563:46: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
 13563 | GDwrtle(int32 gridID, char *fieldname, int32 forttilecoords[], VOIDP data)
       |                                        ~~~~~~^~~~~~~~~~~~~~~~
-SWapi.c: In function 'swattrinfo_':
-GDapi.c: In function 'gdrdtle_':
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDrdtle' from incompatible pointer type [-Wincompatible-pointer-types]
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2570,25 +2513,23 @@
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
-      |         ^~~~~~~~~~~
-GDapi.c:14351:1: note: in expansion of macro 'FCALLSCFUN4'
-14351 | FCALLSCFUN4(INT, GDrdtle, GDRDTLE, gdrdtle, INT32, STRING, INT32V,
+SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
+14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
       | ^~~~~~~~~~~
-GDapi.c:13621:46: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
-13621 | GDrdtle(int32 gridID, char *fieldname, int32 forttilecoords[], VOIDP data)
-      |                                        ~~~~~~^~~~~~~~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
+SWapi.c:7271:53: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7271 | SWrdfld(int32 swathID, const char *fieldname, int32 fortstart[],
+      |                                               ~~~~~~^~~~~~~~~~~
+GDapi.c: In function 'gdrdtle_':
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'GDrdtle' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
 ../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
@@ -2602,19 +2543,19 @@
 ../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
  1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
       |         ^~~~~~~~~~~
-SWapi.c:14557:1: note: in expansion of macro 'FCALLSCFUN4'
-14557 | FCALLSCFUN4(INT, SWattrinfo, SWATTRINFO, swattrinfo, INT32, STRING,
+GDapi.c:14351:1: note: in expansion of macro 'FCALLSCFUN4'
+14351 | FCALLSCFUN4(INT, GDrdtle, GDRDTLE, gdrdtle, INT32, STRING, INT32V,
       | ^~~~~~~~~~~
-SWapi.c:4997:57: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4997 | SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
-      |                                                 ~~~~~~~~^~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
+GDapi.c:13621:46: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+13621 | GDrdtle(int32 gridID, char *fieldname, int32 forttilecoords[], VOIDP data)
+      |                                        ~~~~~~^~~~~~~~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
 ../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
@@ -2622,19 +2563,16 @@
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
- 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
- 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
-      |         ^~~~~~~~~~~
-SWapi.c:14557:1: note: in expansion of macro 'FCALLSCFUN4'
-14557 | FCALLSCFUN4(INT, SWattrinfo, SWATTRINFO, swattrinfo, INT32, STRING,
+SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
+14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
       | ^~~~~~~~~~~
+SWapi.c:7272:15: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7272 |         int32 fortstride[], int32 fortedge[], VOIDP buffer)
+      |         ~~~~~~^~~~~~~~~~~~
 GDapi.c: In function 'gdll2ij_':
-SWapi.c:4997:77: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 4997 | SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
-      |                                                                     ~~~~~~~~^~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 12 of 'GDll2ij' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2669,8 +2607,30 @@
 GDapi.c:8741:28: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  8741 |         int32 row[], int32 col[], float64 xval[], float64 yval[])
       |                      ~~~~~~^~~~~
-SWapi.c: In function 'swinqattrs_':
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'SWrdfld' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+SWapi.c:14550:1: note: in expansion of macro 'FCALLSCFUN6'
+14550 | FCALLSCFUN6(INT, SWrdfld, SWRDFLD, swrdfld, INT32, STRING, INT32V,
+      | ^~~~~~~~~~~
 GDapi.c: In function 'gdij2ll_':
+SWapi.c:7272:35: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 7272 |         int32 fortstride[], int32 fortedge[], VOIDP buffer)
+      |                             ~~~~~~^~~~~~~~~~
 ../include/cfortHdf.h:1445:58: warning: passing argument 10 of 'GDij2ll' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
@@ -2705,7 +2665,55 @@
 GDapi.c:9038:41: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
  9038 |         int32 npnts, int32 row[], int32 col[],
       |                                   ~~~~~~^~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
+GDapi.c: In function 'gdgetdimscale_':
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDgetdimscale' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1752:68: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                                    ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+GDapi.c:14372:1: note: in expansion of macro 'FCALLSCFUN6'
+14372 | FCALLSCFUN6(INT, GDgetdimscale, GDGETDIMSCALE, gdgetdimscale, INT32,
+      | ^~~~~~~~~~~
+GDapi.c:5000:68: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5000 | GDgetdimscale(int32 gridID, char *fieldname, char *dimname, int32 *dimsize,
+      |                                                             ~~~~~~~^~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'GDgetdimscale' from incompatible pointer type [-Wincompatible-pointer-types]
+ 1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
+      |                                                          ^
+      |                                                          |
+      |                                                          long int *
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
+      |                                     ^
+../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
+ 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
+      |       ^~~
+../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
+ 1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+      |         ^~~~~~~~~~~~
+GDapi.c:14372:1: note: in expansion of macro 'FCALLSCFUN6'
+14372 | FCALLSCFUN6(INT, GDgetdimscale, GDGETDIMSCALE, gdgetdimscale, INT32,
+      | ^~~~~~~~~~~
+GDapi.c:5001:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5001 |               int32 *data_type, VOIDP data)
+      |               ~~~~~~~^~~~~~~~~
+SWapi.c: In function 'swattrinfo_':
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2722,18 +2730,16 @@
 ../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
  1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
- 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
       |         ^~~~~~~~~~~
-SWapi.c:14559:1: note: in expansion of macro 'FCALLSCFUN3'
-14559 | FCALLSCFUN3(INT32, SWinqattrs, SWINQATTRS, swinqattrs, INT32, PSTRING,
+SWapi.c:14557:1: note: in expansion of macro 'FCALLSCFUN4'
+14557 | FCALLSCFUN4(INT, SWattrinfo, SWATTRINFO, swattrinfo, INT32, STRING,
       | ^~~~~~~~~~~
-SWapi.c:5062:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5062 | SWinqattrs(int32 swathID, char *attrnames, int32 * strbufsize)
-      |                                            ~~~~~~~~^~~~~~~~~~
-SWapi.c: In function 'swinqdims_':
-GDapi.c: In function 'gdgetdimscale_':
-../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'GDgetdimscale' from incompatible pointer type [-Wincompatible-pointer-types]
+SWapi.c:4997:57: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4997 | SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
+      |                                                 ~~~~~~~~^~~~~~~~~~
+../include/cfortHdf.h:1445:58: warning: passing argument 4 of 'SWattrinfo' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
@@ -2747,19 +2753,26 @@
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-GDapi.c:14372:1: note: in expansion of macro 'FCALLSCFUN6'
-14372 | FCALLSCFUN6(INT, GDgetdimscale, GDGETDIMSCALE, gdgetdimscale, INT32,
+../include/cfortHdf.h:1716:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1716 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,T4,CF_0)
+      |         ^~~~~~~~~~~
+SWapi.c:14557:1: note: in expansion of macro 'FCALLSCFUN4'
+14557 | FCALLSCFUN4(INT, SWattrinfo, SWATTRINFO, swattrinfo, INT32, STRING,
       | ^~~~~~~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWinqdims' from incompatible pointer type [-Wincompatible-pointer-types]
+SWapi.c:4997:77: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 4997 | SWattrinfo(int32 swathID, const char *attrname, int32 * numbertype, int32 * count)
+      |                                                                     ~~~~~~~~^~~~~
+SWapi.c: In function 'swinqattrs_':
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWinqattrs' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
- 1458 | #define TLONGV(         M,I,A,B,D)  A
+../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
+ 1507 | #define TPLONG(         M,I,A,B,D)  A
       |                                     ^
 ../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
  1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
@@ -2773,38 +2786,39 @@
 ../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
  1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
       |         ^~~~~~~~~~~
-SWapi.c:14561:1: note: in expansion of macro 'FCALLSCFUN3'
-14561 | FCALLSCFUN3(INT32, SWinqdims, SWINQDIMS, swinqdims, INT32, PSTRING,
+SWapi.c:14559:1: note: in expansion of macro 'FCALLSCFUN3'
+14559 | FCALLSCFUN3(INT32, SWinqattrs, SWINQATTRS, swinqattrs, INT32, PSTRING,
       | ^~~~~~~~~~~
-GDapi.c:5000:68: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5000 | GDgetdimscale(int32 gridID, char *fieldname, char *dimname, int32 *dimsize,
-      |                                                             ~~~~~~~^~~~~~~
-SWapi.c:5125:48: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5125 | SWinqdims(int32 swathID, char *dimnames, int32 dims[])
-      |                                          ~~~~~~^~~~~~
-../include/cfortHdf.h:1445:58: warning: passing argument 5 of 'GDgetdimscale' from incompatible pointer type [-Wincompatible-pointer-types]
+SWapi.c:5062:52: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5062 | SWinqattrs(int32 swathID, char *attrnames, int32 * strbufsize)
+      |                                            ~~~~~~~~^~~~~~~~~~
+SWapi.c: In function 'swinqdims_':
+../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWinqdims' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
       |                                                          ^
       |                                                          |
       |                                                          long int *
-../include/cfortHdf.h:1507:37: note: in definition of macro 'TPLONG'
- 1507 | #define TPLONG(         M,I,A,B,D)  A
+../include/cfortHdf.h:1458:37: note: in definition of macro 'TLONGV'
+ 1458 | #define TLONGV(         M,I,A,B,D)  A
       |                                     ^
-../include/cfortHdf.h:1753:7: note: in expansion of macro 'TCF'
- 1753 |       TCF(LN,T5,5,1) TCF(LN,T6,6,1) TCF(LN,T7,7,1) TCF(LN,T8,8,1) TCF(LN,T9,9,1) \
-      |       ^~~
+../include/cfortHdf.h:1752:53: note: in expansion of macro 'TCF'
+ 1752 |  _INT(0,LL,T0,0,0) CN(TCF(LN,T1,1,0) TCF(LN,T2,2,1) TCF(LN,T3,3,1) TCF(LN,T4,4,1) \
+      |                                                     ^~~
 ../include/cfortHdf.h:1728:9: note: in expansion of macro 'FCALLSCFUN15'
  1728 |         FCALLSCFUN15(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,T7,T8,T9,TA,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-../include/cfortHdf.h:1720:9: note: in expansion of macro 'FCALLSCFUN10'
- 1720 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,T6,CF_0,CF_0,CF_0,CF_0)
+../include/cfortHdf.h:1718:9: note: in expansion of macro 'FCALLSCFUN10'
+ 1718 |         FCALLSCFUN10(T0,CN,UN,LN,T1,T2,T3,T4,T5,CF_0,CF_0,CF_0,CF_0,CF_0)
       |         ^~~~~~~~~~~~
-GDapi.c:14372:1: note: in expansion of macro 'FCALLSCFUN6'
-14372 | FCALLSCFUN6(INT, GDgetdimscale, GDGETDIMSCALE, gdgetdimscale, INT32,
+../include/cfortHdf.h:1714:9: note: in expansion of macro 'FCALLSCFUN5'
+ 1714 |         FCALLSCFUN5 (T0,CN,UN,LN,T1,T2,T3,CF_0,CF_0)
+      |         ^~~~~~~~~~~
+SWapi.c:14561:1: note: in expansion of macro 'FCALLSCFUN3'
+14561 | FCALLSCFUN3(INT32, SWinqdims, SWINQDIMS, swinqdims, INT32, PSTRING,
       | ^~~~~~~~~~~
-GDapi.c:5001:22: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
- 5001 |               int32 *data_type, VOIDP data)
-      |               ~~~~~~~^~~~~~~~~
+SWapi.c:5125:48: note: expected 'int32 *' {aka 'int *'} but argument is of type 'long int *'
+ 5125 | SWinqdims(int32 swathID, char *dimnames, int32 dims[])
+      |                                          ~~~~~~^~~~~~
 SWapi.c: In function 'swinqmaps_':
 ../include/cfortHdf.h:1445:58: warning: passing argument 3 of 'SWinqmaps' from incompatible pointer type [-Wincompatible-pointer-types]
  1445 | #define TCF(NAME,TN,I,M)  _SEP_(TN,M,COMMA) T##TN(NAME,I,A##I,B##I,C##I)
@@ -3914,10 +3928,10 @@
 	install -m0755 -d debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev
 	install -p -m0644 debian/copyright debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev/copyright
    dh_installchangelogs
-	install -m0755 -d debian/libhdfeos0/usr/share/doc/libhdfeos0
-	install -p -m0644 debian/.debhelper/generated/libhdfeos0/dh_installchangelogs.dch.trimmed debian/libhdfeos0/usr/share/doc/libhdfeos0/changelog.Debian
 	install -m0755 -d debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev
 	install -p -m0644 debian/.debhelper/generated/libhdfeos-dev/dh_installchangelogs.dch.trimmed debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev/changelog.Debian
+	install -m0755 -d debian/libhdfeos0/usr/share/doc/libhdfeos0
+	install -p -m0644 debian/.debhelper/generated/libhdfeos0/dh_installchangelogs.dch.trimmed debian/libhdfeos0/usr/share/doc/libhdfeos0/changelog.Debian
    dh_installexamples
 	install -m0755 -d debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev/examples
 	cp --reflink=auto -a ./samples/AppendField.c debian/libhdfeos-dev/usr/share/doc/libhdfeos-dev/examples
@@ -4051,24 +4065,24 @@
 	echo misc:Pre-Depends= >> debian/libhdfeos0.substvars
 	install -m0755 -d debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN
 	dpkg-gencontrol -plibhdfeos0 -ldebian/changelog -Tdebian/libhdfeos0.substvars -Pdebian/.debhelper/libhdfeos0/dbgsym-root -UPre-Depends -URecommends -USuggests -UEnhances -UProvides -UEssential -UConflicts -DPriority=optional -UHomepage -UImportant -UBuilt-Using -DAuto-Built-Package=debug-symbols -UProtected -DPackage=libhdfeos0-dbgsym "-DDepends=libhdfeos0 (= \${binary:Version})" "-DDescription=debug symbols for libhdfeos0" -DBuild-Ids=ab562c5687e03ea7e64f176bf3c80affa51d386f -DSection=debug -UReplaces -UBreaks
-	chmod 0644 -- debian/libhdfeos-dev/DEBIAN/control
-	chown 0:0 -- debian/libhdfeos-dev/DEBIAN/control
 	chmod 0644 -- debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN/control
 	chown 0:0 -- debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN/control
 	dpkg-gencontrol -plibhdfeos0 -ldebian/changelog -Tdebian/libhdfeos0.substvars -Pdebian/libhdfeos0
+	chmod 0644 -- debian/libhdfeos-dev/DEBIAN/control
+	chown 0:0 -- debian/libhdfeos-dev/DEBIAN/control
 	chmod 0644 -- debian/libhdfeos0/DEBIAN/control
 	chown 0:0 -- debian/libhdfeos0/DEBIAN/control
    dh_md5sums
-	install -m0755 -d debian/libhdfeos0/DEBIAN
 	install -m0755 -d debian/libhdfeos-dev/DEBIAN
+	install -m0755 -d debian/libhdfeos0/DEBIAN
 	cd debian/libhdfeos0 >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^\\@@) { s/\\\\/\\/g; }' > DEBIAN/md5sums
 	cd debian/libhdfeos-dev >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^\\@@) { s/\\\\/\\/g; }' > DEBIAN/md5sums
 	chmod 0644 -- debian/libhdfeos0/DEBIAN/md5sums
 	chown 0:0 -- debian/libhdfeos0/DEBIAN/md5sums
 	install -m0755 -d debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN
-	cd debian/.debhelper/libhdfeos0/dbgsym-root >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^\\@@) { s/\\\\/\\/g; }' > DEBIAN/md5sums
 	chmod 0644 -- debian/libhdfeos-dev/DEBIAN/md5sums
 	chown 0:0 -- debian/libhdfeos-dev/DEBIAN/md5sums
+	cd debian/.debhelper/libhdfeos0/dbgsym-root >/dev/null && xargs -r0 md5sum | perl -pe 'if (s@^\\@@) { s/\\\\/\\/g; }' > DEBIAN/md5sums
 	chmod 0644 -- debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN/md5sums
 	chown 0:0 -- debian/.debhelper/libhdfeos0/dbgsym-root/DEBIAN/md5sums
    dh_builddeb
@@ -4076,8 +4090,8 @@
 	dpkg-deb --root-owner-group --build debian/.debhelper/libhdfeos0/dbgsym-root ..
 	dpkg-deb --build debian/libhdfeos-dev ..
 dpkg-deb: building package 'libhdfeos0' in '../libhdfeos0_2.20v1.00-1_arm64.deb'.
-dpkg-deb: building package 'libhdfeos0-dbgsym' in '../libhdfeos0-dbgsym_2.20v1.00-1_arm64.deb'.
 dpkg-deb: building package 'libhdfeos-dev' in '../libhdfeos-dev_2.20v1.00-1_arm64.deb'.
+dpkg-deb: building package 'libhdfeos0-dbgsym' in '../libhdfeos0-dbgsym_2.20v1.00-1_arm64.deb'.
  dpkg-genbuildinfo --build=binary -O../hdf-eos4_2.20v1.00-1_arm64.buildinfo
  dpkg-genchanges --build=binary -O../hdf-eos4_2.20v1.00-1_arm64.changes
 dpkg-genchanges: info: binary-only upload (no source code included)
@@ -4085,12 +4099,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: including full source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/29998/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/25136 and its subdirectories
-I: Current time: Tue Apr 11 22:51:50 -12 2023
-I: pbuilder-time-stamp: 1681296710
+I: removing directory /srv/workspace/pbuilder/29998 and its subdirectories
+I: Current time: Wed May 15 07:16:30 +14 2024
+I: pbuilder-time-stamp: 1715706990