1 --- hdfeos5/gctp/src/gctp.c.orig 2019-12-09 16:33:53.493125031 +0100
2 +++ hdfeos5/gctp/src/gctp.c 2019-12-09 16:33:57.559769667 +0100
4 static long outdat[MAXPROJ + 1]; /* output dataum array */
5 static long outzn[MAXPROJ + 1]; /* output zone array */
6 static double pdout[MAXPROJ + 1][15]; /* output projection parm array */
7 -static long (*for_trans[MAXPROJ + 1])();/* forward function pointer array*/
8 -static long (*inv_trans[MAXPROJ + 1])();/* inverse function pointer array*/
9 +static int (*for_trans[MAXPROJ + 1])();/* forward function pointer array*/
10 +static int (*inv_trans[MAXPROJ + 1])();/* inverse function pointer array*/
12 /* Table of unit codes as specified by state
13 laws as of 2/1/92 for NAD 1983 State Plane
15 static long NADUT[134] = {1, 5, 1, 1, 5, 1, 1, 1, 1, 2, 1, 1, 1, 2, 1, 1, 2, 2,
16 1, 1, 5, 2, 1, 2, 5, 1, 2, 2, 2, 1, 1, 1, 5, 2, 1, 5,
17 2, 2, 5, 2, 1, 1, 5, 2, 2, 1, 2, 1, 2, 2, 1, 2, 2, 2};
19 +int init(long ipr, long jpr, char *efile, char *pfile);
20 +long untfz(long inunit, long outunit, double *factor);
21 +void close_file(void);
22 +int inv_init(int insys, int inzone, double *inparm, int indatum, char *fn27, char *fn83, int *iflg, int (*inv_trans[])(double, double, double*, double*));
23 +int for_init(int outsys, int outzone, double *outparm, int outdatum, char *fn27, char *fn83, int *iflg, int (*for_trans[])(double, double, double *, double *));
26 static long NAD83[134] = {101,102,5010,5300,201,202,203,301,302,401,402,403,
27 404,405,406,0000,501,502,503,600,700,901,902,903,1001,1002,
29 4502,4601,4602,4701,4702,4801,4802,4803,4901,4902,4903,4904,
30 5001,5002,5003,5004,5005,5006,5007,5008,5009,5200,0000,5400};
32 -gctp(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,outcoor,
33 +int gctp(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,outcoor,
34 outsys,outzone,outparm,outunit,outdatum,fn27,fn83,iflg)
36 double *incoor; /* input coordinates */
41 - inv_init((int)*insys,(int)*inzone,dummy,(int)*indatum,fn27,fn83,&iflgval,(int *)inv_trans);
42 + inv_init((int)*insys,(int)*inzone,dummy,(int)*indatum,fn27,fn83,&iflgval,inv_trans);
45 - inv_init((int)*insys,(int)*inzone,inparm,(int)*indatum,fn27,fn83,&iflgval,(int *)inv_trans);
46 + inv_init((int)*insys,(int)*inzone,inparm,(int)*indatum,fn27,fn83,&iflgval,inv_trans);
51 dummy[0] = outparm[0];
52 dummy[1] = outparm[1];
54 - for_init((int)*outsys,(int)*outzone,dummy,(int)*outdatum,fn27,fn83,&iflgval,(int *)for_trans);
55 + for_init((int)*outsys,(int)*outzone,dummy,(int)*outdatum,fn27,fn83,&iflgval,for_trans);
58 - for_init((int)*outsys,(int)*outzone,outparm,(int)*outdatum,fn27,fn83,&iflgval,(int *)for_trans);
59 + for_init((int)*outsys,(int)*outzone,outparm,(int)*outdatum,fn27,fn83,&iflgval,for_trans);
63 --- hdfeos5/gctp/src/br_gctp.c.orig 2006-12-07 16:52:24.000000000 +0100
64 +++ hdfeos5/gctp/src/br_gctp.c 2019-12-09 16:37:52.638496136 +0100
69 /* Fortran bridge routine for the UNIX */
71 +int gctp(double *incoor, long *insys, long *inzone, double *inparm, long *inunit, long *indatum, long *ipr, char *efile, long *jpr, char *pfile, double *outcoor, long *outsys, long *outzone, double *outparm, long *outunit, long *outdatum, char fn27[], char fn83[], long *iflg);
73 void gctp_(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,
74 outcoor, outsys,outzone,outparm,outunit,fn27,fn83,iflg)
85 gctp(incoor,insys,inzone,inparm,inunit,indatum,ipr,efile,jpr,pfile,outcoor,
86 - outsys,outzone,outparm,outunit,fn27,fn83,iflg);
87 + outsys,outzone,outparm,outunit,NULL /* FIXME */,fn27,fn83,iflg);
91 --- hdfeos5/src/EHapi.c.orig 2017-11-13 17:02:41.000000000 +0100
92 +++ hdfeos5/src/EHapi.c 2019-12-10 05:33:39.956327678 +0100
94 if (fid < HE5_EHIDOFFSET || fid > HE5_NEOSHDF + HE5_EHIDOFFSET)
97 - sprintf(errbuf,"Invalid file ID: %d. ID should range from %d to %d .\n", fid, HE5_EHIDOFFSET, HE5_NEOSHDF + HE5_EHIDOFFSET);
98 + sprintf(errbuf,"Invalid file ID: %"PRId64". ID should range from %d to %d .\n", fid, HE5_EHIDOFFSET, HE5_NEOSHDF + HE5_EHIDOFFSET);
99 H5Epush(__FILE__, "HE5_EHchkfid", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
100 HE5_EHprint(errbuf, __FILE__, __LINE__);
102 @@ -2234,7 +2234,7 @@
103 if( HE5_HeosTable[ fid0 ].active == 0)
106 - sprintf(errbuf,"HE5_EHchkid: File ID %d not active (%s).\n",fid, name);
107 + sprintf(errbuf,"HE5_EHchkid: File ID %"PRId64" not active (%s).\n",fid, name);
108 H5Epush(__FILE__, "HE5_EHchkfid", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
109 HE5_EHprint(errbuf, __FILE__, __LINE__);
111 @@ -8615,7 +8615,7 @@
115 - sprintf(errbuf,"Invalid file ID: %d . ID should range from %d to %d . \n", fid, HE5_EHIDOFFSET, HE5_NEOSHDF + HE5_EHIDOFFSET);
116 + sprintf(errbuf,"Invalid file ID: %"PRId64" . ID should range from %d to %d . \n", fid, HE5_EHIDOFFSET, HE5_NEOSHDF + HE5_EHIDOFFSET);
117 H5Epush(__FILE__, "HE5_EHclose", __LINE__, H5E_FILE, H5E_BADFILE, errbuf);
118 HE5_EHprint(errbuf, __FILE__, __LINE__);
120 @@ -12023,7 +12023,7 @@
121 if( HE5_HeosTable[ fid0 ].active == 0)
124 - sprintf(errbuf,"HE5_EHwritemeta: File ID %d not active \n",fid);
125 + sprintf(errbuf,"HE5_EHwritemeta: File ID %"PRId64" not active \n",fid);
126 H5Epush(__FILE__, "HE5_EHwritemeta", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
127 HE5_EHprint(errbuf, __FILE__, __LINE__);
129 @@ -12295,7 +12295,7 @@
130 if( HE5_HeosTable[ fid0 ].active == 0)
133 - sprintf(errbuf,"HE5_EHreadmeta: File ID %d not active \n",fid);
134 + sprintf(errbuf,"HE5_EHreadmeta: File ID %"PRId64" not active \n",fid);
135 H5Epush(__FILE__, "HE5_EHreadmeta", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
136 HE5_EHprint(errbuf, __FILE__, __LINE__);
138 @@ -12605,7 +12605,7 @@
139 if( HE5_HeosTable[ fid0 ].active == 0)
142 - sprintf(errbuf,"HE5_EHreadmeta: File ID %d not active \n",fid);
143 + sprintf(errbuf,"HE5_EHreadmeta: File ID %"PRId64" not active \n",fid);
144 H5Epush(__FILE__, "HE5_EHreadmeta", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
145 HE5_EHprint(errbuf, __FILE__, __LINE__);
147 --- hdfeos5/src/GDapi.c.orig 2017-11-13 17:02:42.000000000 +0100
148 +++ hdfeos5/src/GDapi.c 2019-12-10 05:32:50.266596870 +0100
149 @@ -7847,6 +7847,10 @@
154 +HE5_GDsetdimscale2(hid_t gridID, char *fieldname, char *dimname,
155 + char *dimscalename, const hsize_t dimsize,
156 + hid_t numbertype_in, void * data);
159 /*----------------------------------------------------------------------------|
160 @@ -17274,7 +17278,7 @@
161 if (regionID < 0 || regionID >= HE5_NGRIDREGN)
164 - sprintf(errbuf, "Invalid Region ID: %d.\n", regionID);
165 + sprintf(errbuf, "Invalid Region ID: %"PRId64".\n", regionID);
166 H5Epush(__FILE__, "HE5_GDregioninfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
167 HE5_EHprint(errbuf, __FILE__, __LINE__);
169 @@ -17289,7 +17293,7 @@
170 if (HE5_GDXRegion[regionID] == 0)
173 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
174 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
175 H5Epush(__FILE__, "HE5_GDregioninfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
176 HE5_EHprint(errbuf, __FILE__, __LINE__);
178 @@ -17792,7 +17796,7 @@
179 if (regionID < 0 || regionID >= HE5_NGRIDREGN)
182 - sprintf(errbuf, "Invalid Region id: %d.\n", regionID);
183 + sprintf(errbuf, "Invalid Region id: %"PRId64".\n", regionID);
184 H5Epush(__FILE__, "HE5_GDextractregion", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
185 HE5_EHprint(errbuf, __FILE__, __LINE__);
187 @@ -17806,7 +17810,7 @@
188 if (HE5_GDXRegion[regionID] == 0)
191 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
192 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
193 H5Epush(__FILE__, "HE5_GDextractregion", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
194 HE5_EHprint(errbuf, __FILE__, __LINE__);
196 --- hdfeos5/src/PTapi.c.orig 2017-11-13 17:02:43.000000000 +0100
197 +++ hdfeos5/src/PTapi.c 2019-12-10 16:35:37.164494445 +0100
199 status = HE5_PTgetlevelname_fromSM(pointID, i, LevelName);
200 if ( status == FAIL )
202 - sprintf(errbuf, "Failed to get LevelName for the Level_%d.",i) ;
203 + sprintf(errbuf, "Failed to get LevelName for the Level_%"PRId64".",i) ;
204 H5Epush(__FILE__, "HE5_PTattach", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
205 HE5_EHprint(errbuf, __FILE__, __LINE__);
207 @@ -1188,7 +1188,7 @@
208 nlevels = HE5_PTnlevels(pointID);
211 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
212 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
213 H5Epush(__FILE__, "HE5_PTnrecs", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
214 HE5_EHprint(errbuf, __FILE__, __LINE__);
216 @@ -1197,7 +1197,7 @@
218 /* Report error if level # to large */
219 /* -------------------------------- */
220 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
221 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
222 H5Epush(__FILE__, "HE5_PTnrecs", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
223 HE5_EHprint(errbuf, __FILE__, __LINE__);
225 @@ -1655,7 +1655,7 @@
229 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
230 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
231 H5Epush(__FILE__, "HE5_PTnfields", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
232 HE5_EHprint(errbuf, __FILE__, __LINE__);
234 @@ -1665,7 +1665,7 @@
235 /* Report error if level # too large */
236 /* --------------------------------- */
238 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
239 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
240 H5Epush(__FILE__, "HE5_PTnfields", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
241 HE5_EHprint(errbuf, __FILE__, __LINE__);
243 @@ -1844,7 +1844,7 @@
247 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
248 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
249 H5Epush(__FILE__, "HE5_PTgetlevelname", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
250 HE5_EHprint(errbuf, __FILE__, __LINE__);
252 @@ -1854,7 +1854,7 @@
253 /* Report error if level # to large */
254 /* -------------------------------- */
256 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
257 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
258 H5Epush(__FILE__, "HE5_PTgetlevelname", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
259 HE5_EHprint(errbuf, __FILE__, __LINE__);
261 @@ -3049,7 +3049,7 @@
265 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
266 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
267 H5Epush(__FILE__, "HE5_PTwritelevel", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
268 HE5_EHprint(errbuf, __FILE__, __LINE__);
270 @@ -3059,7 +3059,7 @@
271 /* Report error if level # to large */
272 /* -------------------------------- */
274 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
275 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
276 H5Epush(__FILE__, "HE5_PTwritelevel", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
277 HE5_EHprint(errbuf, __FILE__, __LINE__);
279 @@ -3488,7 +3488,7 @@
280 nlevels = HE5_PTnlevels(pointID);
283 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
284 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
285 H5Epush(__FILE__, "HE5_PTlevelinfo", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
286 HE5_EHprint(errbuf, __FILE__, __LINE__);
288 @@ -3497,7 +3497,7 @@
290 /* Report error if level # to large */
291 /* -------------------------------- */
292 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
293 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
294 H5Epush(__FILE__, "HE5_PTlevelinfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
295 HE5_EHprint(errbuf, __FILE__, __LINE__);
297 @@ -3915,7 +3915,7 @@
301 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
302 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
303 H5Epush(__FILE__, "HE5_PTreadlevel", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
304 HE5_EHprint(errbuf, __FILE__, __LINE__);
306 @@ -3925,7 +3925,7 @@
307 /* Report error if level # to large */
308 /* -------------------------------- */
310 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
311 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
312 H5Epush(__FILE__, "HE5_PTreadlevel", __LINE__, H5E_FILE, H5E_SEEKERROR, errbuf);
313 HE5_EHprint(errbuf, __FILE__, __LINE__);
315 @@ -9099,7 +9099,7 @@
319 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
320 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
321 H5Epush(__FILE__, "HE5_PTreadlevel_f", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
322 HE5_EHprint(errbuf, __FILE__, __LINE__);
324 @@ -9109,7 +9109,7 @@
325 /* Report error if level # to large */
326 /* -------------------------------- */
328 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
329 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
330 H5Epush(__FILE__, "HE5_PTreadlevel_f", __LINE__, H5E_FILE, H5E_SEEKERROR, errbuf);
331 HE5_EHprint(errbuf, __FILE__, __LINE__);
333 @@ -9513,7 +9513,7 @@
337 - sprintf(errbuf, "No Levels Defined for point ID: %d\n", pointID);
338 + sprintf(errbuf, "No Levels Defined for point ID: %"PRId64"\n", pointID);
339 H5Epush(__FILE__, "HE5_PTwritelevel_f", __LINE__, H5E_BTREE, H5E_NOTFOUND, errbuf);
340 HE5_EHprint(errbuf, __FILE__, __LINE__);
342 @@ -9523,7 +9523,7 @@
343 /* Report error if level # to large */
344 /* -------------------------------- */
346 - sprintf(errbuf, "Only %d levels Defined for point ID: %d\n", nlevels, pointID);
347 + sprintf(errbuf, "Only %d levels Defined for point ID: %"PRId64"\n", nlevels, pointID);
348 H5Epush(__FILE__, "HE5_PTwritelevel_f", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
349 HE5_EHprint(errbuf, __FILE__, __LINE__);
351 --- hdfeos5/src/SWapi.c.orig 2019-12-10 16:45:34.831256606 +0100
352 +++ hdfeos5/src/SWapi.c 2019-12-10 16:45:38.444570365 +0100
353 @@ -2020,6 +2020,9 @@
358 +HE5_SWsetdimscale2(hid_t swathID, char *fieldname, char *dimname, char *dimscalename,
359 + const hsize_t dimsize, hid_t numbertype_in, void * data);
361 /*----------------------------------------------------------------------------|
363 @@ -13361,7 +13364,7 @@
365 if ((HE5_SWXRegion[k]->nRegions) > HE5_MAXNREGIONS)
367 - sprintf(errbuf, "HE5_SWXRegion[%d]->nRegions exceeded HE5_MAXNREGIONS = %d.\n", k, HE5_MAXNREGIONS);
368 + sprintf(errbuf, "HE5_SWXRegion[%"PRId64"]->nRegions exceeded HE5_MAXNREGIONS = %d.\n", k, HE5_MAXNREGIONS);
369 H5Epush(__FILE__, "HE5_SWdefboxregion", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
370 HE5_EHprint(errbuf, __FILE__, __LINE__);
371 if (lonArr != NULL) free(lonArr);
372 @@ -14685,7 +14688,7 @@
373 if (regionID < 0 || regionID >= HE5_NSWATHREGN)
376 - sprintf(errbuf, "Invalid Region ID: %d.\n", regionID);
377 + sprintf(errbuf, "Invalid Region ID: %"PRId64".\n", regionID);
378 H5Epush(__FILE__, "HE5_SWextractregion", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
379 HE5_EHprint(errbuf, __FILE__, __LINE__);
381 @@ -14698,7 +14701,7 @@
382 if (HE5_SWXRegion[regionID] == 0)
385 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
386 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
387 H5Epush(__FILE__, "HE5_SWextractregion", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
388 HE5_EHprint(errbuf, __FILE__, __LINE__);
390 @@ -16253,7 +16256,7 @@
391 if (regionID < 0 || regionID >= HE5_NSWATHREGN)
394 - sprintf(errbuf, "Invalid Region id: %d.\n", regionID);
395 + sprintf(errbuf, "Invalid Region id: %"PRId64".\n", regionID);
396 H5Epush(__FILE__, "HE5_SWregioninfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
397 HE5_EHprint(errbuf, __FILE__, __LINE__);
399 @@ -16266,7 +16269,7 @@
400 if (HE5_SWXRegion[regionID] == 0)
403 - sprintf(errbuf,"Inactive Region ID: %d.\n", regionID);
404 + sprintf(errbuf,"Inactive Region ID: %"PRId64".\n", regionID);
405 H5Epush(__FILE__, "HE5_SWregioninfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
406 HE5_EHprint(errbuf, __FILE__, __LINE__);
408 @@ -16733,7 +16736,7 @@
409 if (regionID < 0 || regionID >= HE5_NSWATHREGN)
412 - sprintf(errbuf, "Invalid Region ID: %d.\n", regionID);
413 + sprintf(errbuf, "Invalid Region ID: %"PRId64".\n", regionID);
414 H5Epush(__FILE__, "HE5_SWupdatescene", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
415 HE5_EHprint(errbuf, __FILE__, __LINE__);
417 @@ -16746,7 +16749,7 @@
418 if (HE5_SWXRegion[regionID] == 0)
421 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
422 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
423 H5Epush(__FILE__, "HE5_SWupdatescene", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
424 HE5_EHprint(errbuf, __FILE__, __LINE__);
426 @@ -16775,7 +16778,7 @@
427 free(HE5_SWXRegion[regionID]);
428 HE5_SWXRegion[regionID] = 0;
430 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
431 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
432 H5Epush(__FILE__, "HE5_SWupdatescene", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
433 HE5_EHprint(errbuf, __FILE__, __LINE__);
435 @@ -16894,7 +16897,7 @@
436 if (regionID < 0 || regionID >= HE5_NSWATHREGN)
439 - sprintf(errbuf,"Invalid Region id: %d.\n", regionID);
440 + sprintf(errbuf,"Invalid Region id: %"PRId64".\n", regionID);
441 H5Epush(__FILE__, "HE5_SWupdateidxmap", __LINE__, H5E_ARGS, H5E_BADRANGE, errbuf);
442 HE5_EHprint(errbuf, __FILE__, __LINE__);
444 @@ -16907,7 +16910,7 @@
445 if (HE5_SWXRegion[regionID] == 0)
448 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
449 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
450 H5Epush(__FILE__, "HE5_SWupdateidxmap", __LINE__, H5E_FILE, H5E_BADRANGE, errbuf );
451 HE5_EHprint(errbuf, __FILE__, __LINE__);
453 @@ -23662,7 +23665,7 @@
454 if (regionID < 0 || regionID >= HE5_NSWATHREGN)
457 - sprintf(errbuf, "Invalid Region ID: %d.\n", regionID);
458 + sprintf(errbuf, "Invalid Region ID: %"PRId64".\n", regionID);
459 H5Epush(__FILE__, "HE5_SWindexinfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
460 HE5_EHprint(errbuf, __FILE__, __LINE__);
462 @@ -23673,7 +23676,7 @@
463 if (HE5_SWXRegion[regionID] == 0)
466 - sprintf(errbuf, "Inactive Region ID: %d.\n", regionID);
467 + sprintf(errbuf, "Inactive Region ID: %"PRId64".\n", regionID);
468 H5Epush(__FILE__, "HE5_SWindexinfo", __LINE__, H5E_ARGS, H5E_BADVALUE, errbuf);
469 HE5_EHprint(errbuf, __FILE__, __LINE__);
471 --- hdfeos5/src/ZAapi.c.orig 2017-11-13 17:02:46.000000000 +0100
472 +++ hdfeos5/src/ZAapi.c 2019-12-10 16:46:27.564304260 +0100
473 @@ -1275,6 +1275,9 @@
478 +HE5_ZAsetdimscale2(hid_t zaID, char *fieldname, char *dimname, char *dimscalename,
479 + const hsize_t dimsize, hid_t numbertype_in, void * data);
481 /*----------------------------------------------------------------------------|
483 --- hdfeos5/samples/he5_gd_datainfo.c.orig 2001-07-11 00:11:08.000000000 +0200
484 +++ hdfeos5/samples/he5_gd_datainfo.c 2019-12-10 16:47:13.027391299 +0100
488 fid = HE5_GDopen(FILENAME, H5F_ACC_RDONLY);
489 - printf("File ID returned by HE5_GDopen() : %d \n", fid);
490 + printf("File ID returned by HE5_GDopen() : %"PRId64" \n", fid);
492 GDid = HE5_GDattach(fid, OBJECT);
493 - printf("Grid ID returned by HE5_GDattach() : %d \n", GDid);
494 + printf("Grid ID returned by HE5_GDattach() : %"PRId64" \n", GDid);
496 fieldgroup = HE5_HDFE_DATAGROUP;
497 status = HE5_GDinqdatatype(GDid, FIELDNAME, NULL, fieldgroup, &datatype, &classid, &order, &size);
498 --- hdfeos5/samples/he5_gd_defunlimfld.c.orig 2014-01-14 18:00:21.000000000 +0100
499 +++ hdfeos5/samples/he5_gd_defunlimfld.c 2019-12-10 16:48:23.313677192 +0100
503 GDid1 = HE5_GDattach(gdfid, "UTMGrid");
504 - printf("Grid ID returned by HE5_GDattach(,\"UTMGrid\"): %d\n", GDid1);
505 + printf("Grid ID returned by HE5_GDattach(,\"UTMGrid\"): %"PRId64"\n", GDid1);
507 /* Define appendable field "Vegetation" */
510 printf("Status returned by HE5_GDdeffield(\"Vegetation\"): %d\n", status);
512 GDid2 = HE5_GDattach(gdfid, "PolarGrid");
513 - printf("Grid ID returned by HE5_GDattach(\"PolarGrid\"): %d\n", GDid2);
514 + printf("Grid ID returned by HE5_GDattach(\"PolarGrid\"): %"PRId64"\n", GDid2);
516 status = HE5_GDdeffield(GDid2, "Temperature", "YDim,XDim", NULL, H5T_NATIVE_FLOAT, 0);
517 printf("Status returned by HE5_GDdeffield(\"Temperature\"): %d\n", status);
518 --- hdfeos5/samples/he5_gd_setup.c.orig 2001-07-11 00:13:46.000000000 +0200
519 +++ hdfeos5/samples/he5_gd_setup.c 2019-12-10 16:49:04.463454265 +0100
523 GDid = HE5_GDcreate(gdfid, "UTMGrid", xdim, ydim, uplft, lowrgt);
524 - printf("Grid ID returned by HE5_GDcreate : %d \n", GDid);
525 + printf("Grid ID returned by HE5_GDcreate : %"PRId64" \n", GDid);
527 status = HE5_GDdefproj(GDid, HE5_GCTP_UTM, zonecode, spherecode, projparm);
528 printf("status returned by HE5_GDdefproj(...\"HE5_GCTP_UTM\"...) : %d \n", status);
532 GDid2 = HE5_GDcreate(gdfid, "PolarGrid", xdim, ydim, NULL, NULL);
533 - printf("Grid ID returned by HE5_GDcreate() : %d \n", GDid2);
534 + printf("Grid ID returned by HE5_GDcreate() : %"PRId64" \n", GDid2);
536 status = HE5_GDdefproj(GDid2, HE5_GCTP_PS, dummy, spherecode, projparm);
537 printf("status returned by HE5_GDdefproj(...\"HE5_GCTP_PS\"...) : %d \n", status);
539 lowrgt[1] = HE5_EHconvAng(20., HE5_HDFE_DEG_DMS);
541 GDid3 = HE5_GDcreate(gdfid, "GEOGrid", xdim, ydim, uplft, lowrgt);
542 - printf("Grid ID returned by HE5_GDcreate() : %d \n", GDid3);
543 + printf("Grid ID returned by HE5_GDcreate() : %"PRId64" \n", GDid3);
545 status = HE5_GDdefproj(GDid3, HE5_GCTP_GEO, dummy, dummy, NULL);
546 printf("status returned by HE5_GDdefproj(...\"HE5_GCTP_GEO\"...) : %d \n", status);
547 --- hdfeos5/samples/he5_gd_subset.c.orig 2003-02-12 20:30:50.000000000 +0100
548 +++ hdfeos5/samples/he5_gd_subset.c 2019-12-10 16:49:21.156697163 +0100
550 cornerlon[1] = 90.; cornerlat[1] = 0.;
552 regionID = HE5_GDdefboxregion(GDid, cornerlon, cornerlat);
553 - printf("Region ID returned by HE5_GDdefboxregion() : %d \n", regionID);
554 + printf("Region ID returned by HE5_GDdefboxregion() : %"PRId64" \n", regionID);
556 ntype = (hid_t *)calloc(1, sizeof(hid_t));
557 status = HE5_GDregioninfo(GDid, regionID, "Temperature", ntype,&rank, dims, &size, upleft, lowright);
558 --- hdfeos5/samples/he5_pt_datainfo.c.orig 2001-07-11 00:16:30.000000000 +0200
559 +++ hdfeos5/samples/he5_pt_datainfo.c 2019-12-10 16:49:46.643225757 +0100
563 fid = HE5_PTopen(FILENAME, H5F_ACC_RDONLY);
564 - printf("File ID returned by HE5_PTopen() : %d \n", fid);
565 + printf("File ID returned by HE5_PTopen() : %"PRId64" \n", fid);
567 PTid = HE5_PTattach(fid, OBJECT);
568 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
569 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
571 fieldgroup = HE5_HDFE_DATAGROUP;
572 status = HE5_PTinqdatatype(PTid, "Observations", NULL, fieldgroup, &datatype, &classid, &order, &size);
573 --- hdfeos5/samples/he5_pt_definelevels.c.orig 2001-07-11 00:16:43.000000000 +0200
574 +++ hdfeos5/samples/he5_pt_definelevels.c 2019-12-10 16:50:03.936465405 +0100
579 - printf("File ID returned by HE5_PTopen() : %d \n", ptfid);
580 + printf("File ID returned by HE5_PTopen() : %"PRId64" \n", ptfid);
584 --- hdfeos5/samples/he5_pt_readattrs.c.orig 2003-03-06 20:47:27.000000000 +0100
585 +++ hdfeos5/samples/he5_pt_readattrs.c 2019-12-10 16:50:59.759496319 +0100
587 /* Open the HDF-EOS file, "Point.h5" */
588 /* --------------------------------- */
589 ptfid = HE5_PTopen("Point.h5", H5F_ACC_RDONLY);
590 - printf("File ID returned by HE5_PTopen() : %d \n", ptfid);
591 + printf("File ID returned by HE5_PTopen() : %"PRId64" \n", ptfid);
593 PTid = HE5_PTattach(ptfid, "FixedBuoy Point");
594 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
595 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
597 nt = (hid_t *)calloc(1, sizeof(hid_t));
599 --- hdfeos5/samples/he5_pt_readdata.c.orig 2001-07-11 00:17:10.000000000 +0200
600 +++ hdfeos5/samples/he5_pt_readdata.c 2019-12-10 16:51:49.905891319 +0100
602 /* Open the HDF-EOS file, "Point.h5" */
603 /* --------------------------------- */
604 ptfid = HE5_PTopen("Point.h5", H5F_ACC_RDONLY);
605 - printf("File ID returned by HE5_PTopen() : %d \n", ptfid);
606 + printf("File ID returned by HE5_PTopen() : %"PRId64" \n", ptfid);
608 /* Read Simple Point */
609 /* ----------------- */
610 PTid = HE5_PTattach(ptfid, "Simple Point");
611 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
612 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
614 /* Get level information */
615 /* --------------------- */
618 printf("Field name: %s \n", level.fieldname[i]);
619 printf("Field rank: %d \n", level.rank[i]);
620 - printf("Field type ID: %d \n", level.dtype[i]);
621 + printf("Field type ID: %"PRId64" \n", level.dtype[i]);
622 for (j = 0; j < level.rank[i]; j++)
623 printf("Field dims: %d \n", (int)level.dims[i][j]);
624 printf("Field class: %d \n", level.dclass[i]);
626 printf("Status returned by HE5_PTdetach() : %d \n", status);
628 PTid = HE5_PTattach(ptfid, "FixedBuoy Point");
629 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
630 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
632 /* Read Fixed Buoy Point Attributes */
633 /* -------------------------------- */
634 --- hdfeos5/samples/he5_pt_writeattrs.c.orig 2001-07-11 00:17:49.000000000 +0200
635 +++ hdfeos5/samples/he5_pt_writeattrs.c 2019-12-10 16:52:30.835669584 +0100
637 /* Open the HDF-EOS file, "Point.h5" */
638 /* --------------------------------- */
639 ptfid = HE5_PTopen("Point.h5", H5F_ACC_RDWR);
640 - printf("File ID returned by HE5_PTopen() : %d \n", ptfid);
641 + printf("File ID returned by HE5_PTopen() : %"PRId64" \n", ptfid);
643 /* Write attribute to "Fixed Buoy Point" */
644 /* ------------------------------------- */
645 PTid = HE5_PTattach(ptfid, "FixedBuoy Point");
646 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
647 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
650 status = HE5_PTwriteattr(PTid, "GlobalAttribute_int", H5T_NATIVE_INT, count, &attr);
652 /* Write attributes to "Floating Buoy Point" */
653 /* ----------------------------------------- */
654 PTid = HE5_PTattach(ptfid, "FloatBuoy Point");
655 - printf("Point ID returned by HE5_PTattach() : %d \n", PTid);
656 + printf("Point ID returned by HE5_PTattach() : %"PRId64" \n", PTid);
659 status = HE5_PTwriteattr(PTid, "GlobalAttribute_float", H5T_NATIVE_FLOAT, count, &flt);
660 --- hdfeos5/samples/he5_sw_datainfo.c.orig 2003-12-01 20:24:51.000000000 +0100
661 +++ hdfeos5/samples/he5_sw_datainfo.c 2019-12-10 16:57:35.334019975 +0100
663 /* Open the HDF-EOS swath file */
664 /* --------------------------- */
665 fid = HE5_SWopen(FILENAME, H5F_ACC_RDONLY);
666 - printf("File ID returned by HE5_SWopen() : %d \n", fid);
667 + printf("File ID returned by HE5_SWopen() : %"PRId64" \n", fid);
669 /* Attach to the "Swath1" swath */
670 /* ---------------------------- */
671 SWid = HE5_SWattach(fid, OBJECT);
672 - printf("Swath ID returned by HE5_SWattach() : %d \n", SWid);
673 + printf("Swath ID returned by HE5_SWattach() : %"PRId64" \n", SWid);
675 /* Inquire data type information for the "Spectra" field */
676 /* ----------------------------------------------------- */
678 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
681 - printf("\tdatatype: %d \n", datatype);
682 + printf("\tdatatype: %"PRId64" \n", datatype);
683 printf("\tclass ID: %d \n", classid);
684 printf("\torder: %d \n", order);
685 printf("\tsize: %d \n", (int)size);
687 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
690 - printf("\tdatatype: %d \n", datatype);
691 + printf("\tdatatype: %"PRId64" \n", datatype);
692 printf("\tclass ID: %d \n", classid);
693 printf("\torder: %d \n", order);
694 printf("\tsize: %d \n", (int)size);
696 printf("Status returned by HE5_EHinqglbdatatype() : %d \n", status);
699 - printf("\tdatatype: %d \n", datatype);
700 + printf("\tdatatype: %"PRId64" \n", datatype);
701 printf("\tclass ID: %d \n", classid);
702 printf("\torder: %d \n", order);
703 printf("\tsize: %d \n", (int)size);
705 printf("Status returned by HE5_EHinqglbdatatype()->GLOBAL_DOUBLE_ATTR_1 : %d \n", status);
708 - printf("\tdatatype: %d \n", datatype);
709 + printf("\tdatatype: %"PRId64" \n", datatype);
710 printf("\tclass ID: %d \n", classid);
711 printf("\torder: %d \n", order);
712 printf("\tsize: %d \n", (int)size);
714 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
717 - printf("\tdatatype: %d \n", datatype);
718 + printf("\tdatatype: %"PRId64" \n", datatype);
719 printf("\tclass ID: %d \n", classid);
720 printf("\torder: %d \n", order);
721 printf("\tsize: %d \n", (int)size);
723 printf("Status returned by HE5_SWinqdatatype()->GLOBAL_CHAR_ATTR_11 : %d \n", status);
726 - printf("\tdatatype: %d \n", datatype);
727 + printf("\tdatatype: %"PRId64" \n", datatype);
728 printf("\tclass ID: %d \n", classid);
729 printf("\torder: %d \n", order);
730 printf("\tsize: %d \n", (int)size);
732 printf("Status returned by HE5_SWinqdatatype()->GLOBAL_CHAR_ATTR : %d \n", status);
735 - printf("\tdatatype: %d \n", datatype);
736 + printf("\tdatatype: %"PRId64" \n", datatype);
737 printf("\tclass ID: %d \n", classid);
738 printf("\torder: %d \n", order);
739 printf("\tsize: %d \n", (int)size);
741 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
744 - printf("\tdatatype: %d \n", datatype);
745 + printf("\tdatatype: %"PRId64" \n", datatype);
746 printf("\tclass ID: %d \n", classid);
747 printf("\torder: %d \n", order);
748 printf("\tsize: %d \n", (int)size);
750 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
753 - printf("\tdatatype: %d \n", datatype);
754 + printf("\tdatatype: %"PRId64" \n", datatype);
755 printf("\tclass ID: %d \n", classid);
756 printf("\torder: %d \n", order);
757 printf("\tsize: %d \n", (int)size);
759 printf("Status returned by HE5_SWinqdatatype() : %d \n", status);
762 - printf("\tdatatype: %d \n", datatype);
763 + printf("\tdatatype: %"PRId64" \n", datatype);
764 printf("\tclass ID: %d \n", classid);
765 printf("\torder: %d \n", order);
766 printf("\tsize: %d \n", (int)size);
767 --- hdfeos5/samples/he5_sw_info.c.orig 2004-01-20 20:17:54.000000000 +0100
768 +++ hdfeos5/samples/he5_sw_info.c 2019-12-10 17:01:28.582756358 +0100
771 printf("geo fields: %s\n", fieldlist);
772 for (i = 0; i < nflds; i++)
773 - printf("Rank: %d Data type: %d\n", rank[i], ntype[i]);
774 + printf("Rank: %d Data type: %"PRId64"\n", rank[i], ntype[i]);
780 printf("data fields: %s\n", fieldlist);
781 for (i = 0; i < nflds; i++)
782 - printf("Rank: %d Data type: %d\n", rank[i], ntype[i]);
783 + printf("Rank: %d Data type: %"PRId64"\n", rank[i], ntype[i]);
787 @@ -158,14 +158,14 @@
788 /* ----------------------------- */
789 status = HE5_SWfieldinfo(SWid, "Longitude", &rk, dim, &dtype, dimlist, NULL);
790 printf("Longitude Rank: %d\n", rk);
791 - printf("Longitude NumberType: %d\n", dtype);
792 + printf("Longitude NumberType: %"PRId64"\n", dtype);
793 printf("Longitude Dimension List: %s\n", dimlist);
794 for (i = 0; i < rk; i++)
795 printf("Dimension %d: %lu\n",i+1,(unsigned long)dim[i]);
797 status = HE5_SWfieldinfo(SWid, "Test_string", &rk1, dim1, &dtype_char, dimlist1, NULL);
798 printf("Test_string Rank: %d\n", rk1);
799 - printf("Test_string NumberType: %d\n", dtype_char);
800 + printf("Test_string NumberType: %"PRId64"\n", dtype_char);
801 printf("Test_string Dimension List: %s\n", dimlist1);
802 for (i = 0; i < rk1; i++)
803 printf("Dimension %d: %lu\n",i+1,(unsigned long)dim1[i]);
804 @@ -175,17 +175,17 @@
805 /* -------------------------------- */
806 printf("Global Attribute:\n");
807 status = HE5_SWattrinfo(SWid,"GlobalAttribute",&dtype1, &nelem);
808 - printf("\t\t Data type: %d\n", dtype1);
809 + printf("\t\t Data type: %"PRId64"\n", dtype1);
810 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
813 status = HE5_SWattrinfo(SWid,"GLOBAL_CHAR_ATTR",&dtype1, &nelem);
814 - printf("\t\t Data type: %d\n", dtype1);
815 + printf("\t\t Data type: %"PRId64"\n", dtype1);
816 printf("\t\t The size of string: %lu \n", (unsigned long)nelem);
819 status = HE5_SWattrinfo(SWid,"GLOBAL_DOUBLE_ATTR",&dtype1, &nelem);
820 - printf("\t\t Data type: %d\n", dtype1);
821 + printf("\t\t Data type: %"PRId64"\n", dtype1);
822 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
826 /* ------------------------------- */
827 printf("Group Attribute:\n");
828 status = HE5_SWgrpattrinfo(SWid,"GroupAttribute",&dtype1,&nelem);
829 - printf("\t\t Data type: %d\n", dtype1);
830 + printf("\t\t Data type: %"PRId64"\n", dtype1);
831 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
834 @@ -203,17 +203,17 @@
835 /* ------------------------------- */
836 printf("Local Attribute:\n");
837 status = HE5_SWlocattrinfo(SWid,"Density", "LocalAttribute_1",&dtype1,&nelem);
838 - printf("\t\t Data type: %d\n", dtype1);
839 + printf("\t\t Data type: %"PRId64"\n", dtype1);
840 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
842 printf("Local Attribute:\n");
843 status = HE5_SWlocattrinfo(SWid,"Longitude", "LocalAttribute_2",&dtype1,&nelem);
844 - printf("\t\t Data type: %d\n", dtype1);
845 + printf("\t\t Data type: %"PRId64"\n", dtype1);
846 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
849 status = HE5_SWlocattrinfo(SWid,"Time", "LOCAL_CHAR_ATTR",&dtype1,&nelem);
850 - printf("\t\t Data type: %d\n", dtype1);
851 + printf("\t\t Data type: %"PRId64"\n", dtype1);
852 printf("\t\t The size of string: %lu \n", (unsigned long)nelem);
854 /* Inquire Global Attributes */
855 --- hdfeos5/samples/he5_sw_setup.c.orig 2003-02-12 20:32:10.000000000 +0100
856 +++ hdfeos5/samples/he5_sw_setup.c 2019-12-10 17:51:25.706519547 +0100
858 /* Open a new HDF-EOS swath file, "Swath.h5" */
859 /* ----------------------------------------- */
860 swfid = HE5_SWopen("Swath.h5", H5F_ACC_TRUNC);
861 - printf("File ID returned by HE5_SWopen(): %d \n", swfid);
862 + printf("File ID returned by HE5_SWopen(): %"PRId64" \n", swfid);
864 /* Create the swath, "Swath1", within the file */
865 /* ------------------------------------------- */
866 SWid = HE5_SWcreate(swfid, "Swath1");
867 - printf("Swath ID returned by HE5_SWcreate(): %d \n", SWid);
868 + printf("Swath ID returned by HE5_SWcreate(): %"PRId64" \n", SWid);
870 /* Define dimensions and specify their sizes */
871 /* ----------------------------------------- */
872 --- hdfeos5/samples/he5_sw_subset.c.orig 2003-02-12 20:32:29.000000000 +0100
873 +++ hdfeos5/samples/he5_sw_subset.c 2019-12-10 17:51:57.159682484 +0100
876 regionID = HE5_SWdefboxregion(SWid, cornerlon, cornerlat, HE5_HDFE_MIDPOINT);
878 - printf("Region ID returned by HE5_SWdefboxregion() : %d \n", regionID);
879 + printf("Region ID returned by HE5_SWdefboxregion() : %"PRId64" \n", regionID);
881 ntype = (hid_t *)calloc(1, sizeof(hid_t) );
885 periodID = HE5_SWdeftimeperiod(SWid, start_time, stop_time, HE5_HDFE_MIDPOINT);
887 - printf("Period ID returned by HE5_SWdeftimeperiod() : %d \n", periodID);
888 + printf("Period ID returned by HE5_SWdeftimeperiod() : %"PRId64" \n", periodID);
890 status = HE5_SWperiodinfo(SWid, periodID, "Time", ntype, &rank, dims, &size);
891 printf("Status returned by HE5_SWperiodinfo() : %d \n", status);
892 --- hdfeos5/samples/he5_za_datainfo.c.orig 2003-06-03 20:09:03.000000000 +0200
893 +++ hdfeos5/samples/he5_za_datainfo.c 2019-12-10 17:57:51.877760812 +0100
895 /* Open the HDF-EOS ZA file */
896 /* ------------------------ */
897 fid = HE5_ZAopen(FILENAME, H5F_ACC_RDONLY);
898 - printf("File ID returned by HE5_ZAopen() : %d \n", fid);
899 + printf("File ID returned by HE5_ZAopen() : %"PRId64" \n", fid);
901 /* Attach to the "ZA1" za */
902 /* ---------------------- */
903 ZAid = HE5_ZAattach(fid, OBJECT);
904 - printf("ZA ID returned by HE5_ZAattach() : %d \n", ZAid);
905 + printf("ZA ID returned by HE5_ZAattach() : %"PRId64" \n", ZAid);
907 /* Inquire data type information for the "Spectra" field */
908 /* ----------------------------------------------------- */
910 printf("Status returned by HE5_ZAinqdatatype() : %d \n", status);
913 - printf("\tdatatype: %d \n", datatype);
914 + printf("\tdatatype: %"PRId64" \n", datatype);
915 printf("\tclass ID: %d \n", classid);
916 printf("\torder: %d \n", order);
917 printf("\tsize: %d \n", (int)size);
919 printf("Status returned by HE5_ZAinqdatatype() : %d \n", status);
922 - printf("\tdatatype: %d \n", datatype);
923 + printf("\tdatatype: %"PRId64" \n", datatype);
924 printf("\tclass ID: %d \n", classid);
925 printf("\torder: %d \n", order);
926 printf("\tsize: %d \n", (int)size);
928 printf("Status returned by HE5_ZAinqdatatype() : %d \n", status);
931 - printf("\tdatatype: %d \n", datatype);
932 + printf("\tdatatype: %"PRId64" \n", datatype);
933 printf("\tclass ID: %d \n", classid);
934 printf("\torder: %d \n", order);
935 printf("\tsize: %d \n", (int)size);
937 printf("Status returned by HE5_ZAinqdatatype() : %d \n", status);
940 - printf("\tdatatype: %d \n", datatype);
941 + printf("\tdatatype: %"PRId64" \n", datatype);
942 printf("\tclass ID: %d \n", classid);
943 printf("\torder: %d \n", order);
944 printf("\tsize: %d \n", (int)size);
945 --- hdfeos5/samples/he5_za_info.c.orig 2004-01-20 20:18:40.000000000 +0100
946 +++ hdfeos5/samples/he5_za_info.c 2019-12-10 17:58:44.894140264 +0100
949 printf("data fields: %s\n", fieldlist);
950 for (i = 0; i < nflds; i++)
951 - printf("Rank: %d Data type: %d\n", rank[i], ntype[i]);
952 + printf("Rank: %d Data type: %"PRId64"\n", rank[i], ntype[i]);
957 /* -------------------------------- */
958 printf("Global Attribute:\n");
959 status = HE5_ZAattrinfo(ZAid,"GlobalAttribute",&dtype, &nelem);
960 - printf("\t\t Data type: %d\n", dtype);
961 + printf("\t\t Data type: %"PRId64"\n", dtype);
962 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
966 /* ------------------------------- */
967 printf("Group Attribute:\n");
968 status = HE5_ZAgrpattrinfo(ZAid,"GroupAttribute",&dtype,&nelem);
969 - printf("\t\t Data type: %d\n", dtype);
970 + printf("\t\t Data type: %"PRId64"\n", dtype);
971 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
975 /* ------------------------------- */
976 printf("Local Attribute:\n");
977 status = HE5_ZAlocattrinfo(ZAid,"Density", "LocalAttribute",&dtype,&nelem);
978 - printf("\t\t Data type: %d\n", dtype);
979 + printf("\t\t Data type: %"PRId64"\n", dtype);
980 printf("\t\t Number of elements: %lu \n", (unsigned long)nelem);
983 --- hdfeos5/samples/he5_za_setup.c.orig 2003-06-03 20:10:23.000000000 +0200
984 +++ hdfeos5/samples/he5_za_setup.c 2019-12-10 17:59:06.717355371 +0100
986 /* Open a new HDF-EOS za file, "ZA.he5" */
987 /* ----------------------------------- */
988 zafid = HE5_ZAopen("ZA.he5", H5F_ACC_TRUNC);
989 - printf("File ID returned by HE5_ZAopen(): %d \n", zafid);
990 + printf("File ID returned by HE5_ZAopen(): %"PRId64" \n", zafid);
992 /* Create the ZA, "ZA1", within the file */
993 /* ------------------------------------- */
994 ZAid = HE5_ZAcreate(zafid, "ZA1");
995 - printf("ZA ID returned by HE5_ZAcreate(): %d \n", ZAid);
996 + printf("ZA ID returned by HE5_ZAcreate(): %"PRId64" \n", ZAid);
998 /* Define dimensions and specify their sizes */
999 /* ----------------------------------------- */