Package: hdf-eos5 / 5.1.15.dfsg.1-8.1

hid_t.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
Index: hdf-eos5-5.1.15.dfsg.1/src/EHapi.c
===================================================================
--- hdf-eos5-5.1.15.dfsg.1.orig/src/EHapi.c
+++ hdf-eos5-5.1.15.dfsg.1/src/EHapi.c
@@ -314,6 +314,8 @@ HE5_EHhid2long(hid_t invalue)
 	outvalue = HE5_EHint2long(invalue);
   else if (sizeof(hid_t) == sizeof(long))
 	outvalue = invalue;
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHllong2long(invalue);
   
   return(outvalue);
 }
@@ -399,6 +401,8 @@ HE5_EHhid2int(hid_t invalue)
 	outvalue = invalue;
   else if (sizeof(hid_t) == sizeof(long))
 	outvalue = HE5_EHlong2int(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHllong2int(invalue);
   
   return(outvalue);
 }
@@ -436,6 +440,8 @@ HE5_EHint2hid(int invalue)
 	outvalue = invalue;
   else if (sizeof(hid_t) == sizeof(long))
 	outvalue = HE5_EHint2long(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHint2llong(invalue);
   
   return(outvalue);
 }
@@ -474,6 +480,8 @@ HE5_EHlong2hid(long invalue)
 	outvalue = HE5_EHlong2int(invalue);
   else if (sizeof(hid_t) == sizeof(long))
 	outvalue = invalue;
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHlong2llong(invalue);
   
   return(outvalue);
 }
@@ -565,6 +573,8 @@ HE5_EHhid2hsize(hid_t invalue)
 	outvalue = HE5_EHint2hsize(invalue);
   else if (sizeof(hid_t) == sizeof(long) )
 	outvalue = HE5_EHlong2hsize(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHllong2hsize(invalue);
 
   return(outvalue);  
 }
@@ -717,6 +727,8 @@ HE5_EHhsize2hid(hsize_t invalue)
 	outvalue = HE5_EHhsize2int(invalue);
   else if (sizeof(hid_t) == sizeof(long) )
 	outvalue = HE5_EHhsize2long(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHhsize2llong(invalue);
 
   return(outvalue);
 }
@@ -866,6 +878,8 @@ HE5_EHhid2hssize(hid_t invalue)
 	outvalue = HE5_EHint2hssize(invalue);
   else if (sizeof(hid_t) == sizeof(long) )
 	outvalue = HE5_EHlong2hssize(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHllong2hssize(invalue);
 
   return(outvalue);
 }
@@ -1016,6 +1030,8 @@ HE5_EHhssize2hid(hssize_t invalue)
 	outvalue = HE5_EHhssize2int(invalue);
   else if (sizeof(hid_t) == sizeof(long) )
 	outvalue = HE5_EHhssize2long(invalue);
+  else if (sizeof(hid_t) == sizeof(long long))
+	outvalue = HE5_EHhssize2llong(invalue);
   
   return(outvalue);  
 }
@@ -1348,6 +1364,178 @@ HE5_EHhsize2hssize(hsize_t invalue)
   return(outvalue);
 }
 
+long long 
+HE5_EHint2llong(int invalue)
+{
+  herr_t        status   = FAIL;
+  long long     outvalue = FAIL;
+  long long     buf      = FAIL;
+
+
+  memmove(&buf,&invalue,sizeof(int));
+
+  status = H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHint2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"int\" to \"long long\" data type.");
+	  return(status);
+	}
+ 
+  memmove(&outvalue,&buf,sizeof(long long));
+
+  return(outvalue);
+}
+long long 
+HE5_EHlong2llong(long invalue)
+{
+  herr_t        status   = FAIL;
+  long long     outvalue = FAIL;
+  long long     buf      = FAIL;
+
+
+  memmove(&buf,&invalue,sizeof(long));
+
+  status = H5Tconvert(H5T_NATIVE_LONG, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHlong2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long\" to \"long long\" data type.");
+	  return(status);
+	}
+ 
+  memmove(&outvalue,&buf,sizeof(long long));
+
+  return(outvalue);
+}
+long long 
+HE5_EHhsize2llong(hsize_t invalue)
+{
+  herr_t        status   = FAIL;
+  long long     outvalue = FAIL;
+  long long     buf      = FAIL;
+
+
+  memmove(&buf,&invalue,H5Tget_size(H5T_NATIVE_HSIZE));
+
+  status = H5Tconvert(H5T_NATIVE_HSIZE, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHhsize2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"hsize_t\" to \"long long\" data type.");
+	  return(status);
+	}
+ 
+  memmove(&outvalue,&buf,sizeof(long long));
+
+  return(outvalue);
+}
+long long 
+HE5_EHhssize2llong(hssize_t invalue)
+{
+  herr_t        status   = FAIL;
+  long long     outvalue = FAIL;
+  long long     buf      = FAIL;
+
+
+  memmove(&buf,&invalue,H5Tget_size(H5T_NATIVE_HSSIZE));
+
+  status = H5Tconvert(H5T_NATIVE_HSSIZE, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHhssize2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"hssize_t\" to \"long long\" data type.");
+	  return(status);
+	}
+ 
+  memmove(&outvalue,&buf,sizeof(long long));
+
+  return(outvalue);
+}
+int 
+HE5_EHllong2int(long long invalue)
+{
+  herr_t                  status   = FAIL;
+  int                     outvalue = FAIL;
+  long long               *buf     = (long long *)NULL;
+
+  buf = (long long *)calloc(1,sizeof(long long));
+  memmove(buf,&invalue,sizeof(long long));
+				 
+  status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_INT, 1, buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHllong2int", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"int\" data type.");
+	  return(status);
+	}
+				 
+  memmove(&outvalue,buf,sizeof(int));
+  free(buf);
+	  
+  return(outvalue);
+}
+long 
+HE5_EHllong2long(long long invalue)
+{
+  herr_t                  status   = FAIL;
+  long                    outvalue = FAIL;
+  long long               *buf     = (long long *)NULL;
+
+  buf = (long long *)calloc(1,sizeof(long long));
+  memmove(buf,&invalue,sizeof(long long));
+				 
+  status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_LONG, 1, buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHllong2long", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"long\" data type.");
+	  return(status);
+	}
+				 
+  memmove(&outvalue,buf,sizeof(long));
+  free(buf);
+	  
+  return(outvalue);
+}
+hsize_t 
+HE5_EHllong2hsize(long long invalue)
+{
+  herr_t                  status   = FAIL;
+  hsize_t                 outvalue = FAIL;
+  long long               *buf     = (long long *)NULL;
+
+  buf = (long long *)calloc(1,sizeof(long long));
+  memmove(buf,&invalue,sizeof(long long));
+				 
+  status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_HSIZE, 1, buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHllong2hsize", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"hsize_t\" data type.");
+	  return(status);
+	}
+				 
+  memmove(&outvalue,buf,H5Tget_size(H5T_NATIVE_HSIZE));
+  free(buf);
+	  
+  return(outvalue);
+}
+hssize_t 
+HE5_EHllong2hssize(long long invalue)
+{
+  herr_t                  status   = FAIL;
+  hssize_t                outvalue = FAIL;
+  long long               *buf     = (long long *)NULL;
+
+  buf = (long long *)calloc(1,sizeof(long long));
+  memmove(buf,&invalue,sizeof(long long));
+				 
+  status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_HSSIZE, 1, buf, NULL, H5P_DEFAULT);
+  if (status == FAIL)
+	{
+	  H5Epush(__FILE__, "HE5_EHllong2hssize", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"hssize_t\" data type.");
+	  return(status);
+	}
+				 
+  memmove(&outvalue,buf,H5Tget_size(H5T_NATIVE_HSSIZE));
+  free(buf);
+	  
+  return(outvalue);
+}
 
 /*----------------------------------------------------------------------------|
 |  BEGIN_PROLOG                                                               |
Index: hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h
===================================================================
--- hdf-eos5-5.1.15.dfsg.1.orig/include/HE5_HdfEosDef.h
+++ hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h
@@ -560,6 +560,15 @@ long                 HE5_EHhssize2long(h
 int                  HE5_EHhssize2int(hssize_t invalue);
 hsize_t              HE5_EHhssize2hsize(hssize_t invalue);
 
+long long            HE5_EHint2llong(int invalue);
+long long            HE5_EHlong2llong(long invalue);
+long long            HE5_EHhsize2llong(hsize_t invalue);
+long long            HE5_EHhssize2llong(hssize_t invalue);
+int                  HE5_EHllong2int(long long invalue);
+long                 HE5_EHllong2long(long long invalue);
+hsize_t              HE5_EHllong2hsize(long long invalue);
+hssize_t             HE5_EHllong2hssize(long long invalue);
+
 unsigned LONGLONG    HE5_EHint2ullong(int invalue);
 long                 HE5_EHullong2long(unsigned LONGLONG invalue);
 
Index: hdf-eos5-5.1.15.dfsg.1/src/PTapi.c
===================================================================
--- hdf-eos5-5.1.15.dfsg.1.orig/src/PTapi.c
+++ hdf-eos5-5.1.15.dfsg.1/src/PTapi.c
@@ -104,82 +104,82 @@ HE5_PTgetlevelname_fromSM(hid_t pointID,
 int
 HE5_PTopenF(char *filename, uintn Flags);
 int 
-HE5_PTcreateF(int FileID, char *pointname);
+HE5_PTcreateF(hid_t FileID, char *pointname);
 int
-HE5_PTattachF(int FileID, char *pointname);
+HE5_PTattachF(hid_t FileID, char *pointname);
 int
-HE5_PTdetachF(int pointID);
+HE5_PTdetachF(hid_t pointID);
 int 
-HE5_PTcloseF(int FileID);
+HE5_PTcloseF(hid_t FileID);
 
 /* Definition routines */
 
 int
-HE5_PTdeflevelF(int  pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]);
+HE5_PTdeflevelF(hid_t  pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]);
 int  
-HE5_PTdeflinkageF(int pointID, char *parent, char *child, char *linkfield);
+HE5_PTdeflinkageF(hid_t pointID, char *parent, char *child, char *linkfield);
 
 /* I/O routines */
 
 int 
-HE5_PTreadlevelF(int pointID, int level, char *fieldname, int ntype, void *datbuf);
+HE5_PTreadlevelF(hid_t pointID, int level, char *fieldname, int ntype, void *datbuf);
 int
-HE5_PTupdatelevelF(int pointID, int level, char *fieldlist, long nrec,  long recs[], int ntype, void *data);
+HE5_PTupdatelevelF(hid_t pointID, int level, char *fieldlist, long nrec,  long recs[], int ntype, void *data);
 int
-HE5_PTwritelevelF(int pointID, int level, long count[], char *fieldname, int ntype, void *data);
+HE5_PTwritelevelF(hid_t pointID, int level, long count[], char *fieldname, int ntype, void *data);
 int
-HE5_PTwriteattrF(int pointID, const char *attrname, int ntype, long fortcount[], void *datbuf);
+HE5_PTwriteattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void *datbuf);
 int
-HE5_PTwritegrpattrF(int pointID, const char *attrname, int ntype, long fortcount[], void * datbuf);
+HE5_PTwritegrpattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void * datbuf);
 int 
-HE5_PTwritelocattrF(int pointID, const char *levelname, const char *attrname, int ntype, long count[],void * datbuf);
+HE5_PTwritelocattrF(hid_t pointID, const char *levelname, const char *attrname, int ntype, long count[],void * datbuf);
 int 
-HE5_PTreadattrF(int pointID, const char *attrname, void *datbuf);
+HE5_PTreadattrF(hid_t pointID, const char *attrname, void *datbuf);
 int  
-HE5_PTreadgrpattrF(int pointID, const char *attrname, void *datbuf);
+HE5_PTreadgrpattrF(hid_t pointID, const char *attrname, void *datbuf);
 int  
-HE5_PTreadlocattrF(int pointID, const char *levelname, const char *attrname, void *datbuf);
+HE5_PTreadlocattrF(hid_t pointID, const char *levelname, const char *attrname, void *datbuf);
 int       
-HE5_PTwrbckptrF(int pointID, int level);
+HE5_PTwrbckptrF(hid_t pointID, int level);
 int       
-HE5_PTwrfwdptrF(int pointID, int level);
+HE5_PTwrfwdptrF(hid_t pointID, int level);
 
 /* Inquiry routines */
 
 int 
-HE5_PTnrecsF(int pointID, int level);
+HE5_PTnrecsF(hid_t pointID, int level);
 int
 HE5_PTnlevelsF(hid_t pointID);
 int 
-HE5_PTnfieldsF(int pointID, int level, char *fieldlist, long *strbufsize);
+HE5_PTnfieldsF(hid_t pointID, int level, char *fieldlist, long *strbufsize);
 int  
-HE5_PTlevelindxF(int pointID, const char *levelname);
+HE5_PTlevelindxF(hid_t pointID, const char *levelname);
 int 
-HE5_PTgetlevelnameF(int pointID, int  level, char *levelname, long *strbufsize);
+HE5_PTgetlevelnameF(hid_t pointID, int  level, char *levelname, long *strbufsize);
 int 
-HE5_PTbcklinkinfoF(int pointID, int level, char *linkfield);
+HE5_PTbcklinkinfoF(hid_t pointID, int level, char *linkfield);
 int   
-HE5_PTfwdlinkinfoF(int pointID, int level, char *linkfield);
+HE5_PTfwdlinkinfoF(hid_t pointID, int level, char *linkfield);
 int  
-HE5_PTlevelinfoF(int pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]);
+HE5_PTlevelinfoF(hid_t pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]);
 int   
-HE5_PTinqdatatypeF(int pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size);
+HE5_PTinqdatatypeF(hid_t pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size);
 int  
 HE5_PTinqpointF(const char *filename, char *pointlist, long *strbufsize);
 int 
-HE5_PTattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount);
+HE5_PTattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount);
 int
-HE5_PTgrpattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount);
+HE5_PTgrpattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount);
 int   
-HE5_PTlocattrinfoF(int pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount);
+HE5_PTlocattrinfoF(hid_t pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount);
 long 
-HE5_PTinqattrsF(int pointID, char *attrnames, long *strbufsize);
+HE5_PTinqattrsF(hid_t pointID, char *attrnames, long *strbufsize);
 long 
-HE5_PTinqgrpattrsF(int pointID, char *attrnames, long *strbufsize);
+HE5_PTinqgrpattrsF(hid_t pointID, char *attrnames, long *strbufsize);
 long 
-HE5_PTinqlocattrsF(int pointID, const char *levelname, char *attrnames, long *strbufsize);
+HE5_PTinqlocattrsF(hid_t pointID, const char *levelname, char *attrnames, long *strbufsize);
 int
-HE5_PTnumtypeinfoF(int pointID, int level, int numtype[]);
+HE5_PTnumtypeinfoF(hid_t pointID, int level, int numtype[]);
 
 
 /* Fortran Wrapper Utility Routines  */
@@ -8119,7 +8119,7 @@ HE5_PTopenF(char *filename, uintn Flags)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTcreateF(int FileID, char *pointname)
+HE5_PTcreateF(hid_t FileID, char *pointname)
 {
   int             PointID   = FAIL;/* point ID (return value)             */
 
@@ -8187,7 +8187,7 @@ HE5_PTcreateF(int FileID, char *pointnam
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTattachF(int FileID, char *pointname)
+HE5_PTattachF(hid_t FileID, char *pointname)
 {
   int             PointID  = FAIL;	/* Return value of the Point ID    */
 
@@ -8259,7 +8259,7 @@ HE5_PTattachF(int FileID, char *pointnam
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTdetachF(int  PointID)   
+HE5_PTdetachF(hid_t  PointID)   
 {
   int             ret    = FAIL;/* (int) Return status variable   */
 
@@ -8329,7 +8329,7 @@ HE5_PTdetachF(int  PointID)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTcloseF(int FileID)
+HE5_PTcloseF(hid_t FileID)
 {
   int               ret    = FAIL;/* (int) return status variable   */
 
@@ -8412,7 +8412,7 @@ HE5_PTcloseF(int FileID)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTdeflevelF(int  pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[])
+HE5_PTdeflevelF(hid_t  pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[])
 {
   herr_t            status    = FAIL;/* routine return status variable */    
 
@@ -8609,7 +8609,7 @@ HE5_PTdeflevelF(int  pointID, const char
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTdeflinkageF(int pointID, char *parent, char *child, char *linkfield)
+HE5_PTdeflinkageF(hid_t pointID, char *parent, char *child, char *linkfield)
 {
   int       ret     = FAIL;/* (int) Return status variable   */
 
@@ -8686,7 +8686,7 @@ HE5_PTdeflinkageF(int pointID, char *par
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTreadlevelF(int pointID, int level, char *fieldname, int ntype, void *datbuf)
+HE5_PTreadlevelF(hid_t pointID, int level, char *fieldname, int ntype, void *datbuf)
 {
   int            ret     = FAIL;/* (int) return status variable   */
 
@@ -9075,7 +9075,7 @@ HE5_PTreadlevel_f(hid_t pointID, int lev
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTwritelevelF(int pointID, int level, long count[], char *fieldname, int ntype, void *data)
+HE5_PTwritelevelF(hid_t pointID, int level, long count[], char *fieldname, int ntype, void *data)
 {
   herr_t            status = FAIL;/* routine return status variable */
 
@@ -9546,7 +9546,7 @@ HE5_PTwritelevel_f(hid_t pointID, int le
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int   
-HE5_PTwrbckptrF(int pointID, int level)
+HE5_PTwrbckptrF(hid_t pointID, int level)
 {
   int             ret    = FAIL;/* (int) Return status variable   */
 
@@ -9615,7 +9615,7 @@ HE5_PTwrbckptrF(int pointID, int level)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int   
-HE5_PTwrfwdptrF(int pointID, int level)
+HE5_PTwrfwdptrF(hid_t pointID, int level)
 {
   int             ret    = FAIL;/* (int) Return status variable   */
 
@@ -9688,7 +9688,7 @@ HE5_PTwrfwdptrF(int pointID, int level)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTupdatelevelF(int pointID, int level, char *fieldlist, long nrec,  long recs[], int ntype, void *data)
+HE5_PTupdatelevelF(hid_t pointID, int level, char *fieldlist, long nrec,  long recs[], int ntype, void *data)
 {
   herr_t            status  = FAIL;
 
@@ -10426,7 +10426,7 @@ HE5_PTupdatelevel_f(hid_t pointID, int l
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTwriteattrF(int pointID, const char *attrname, int ntype, long fortcount[], void *datbuf)
+HE5_PTwriteattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void *datbuf)
 {
 
   int       ret     = FAIL;/* int return status variable                 */
@@ -10584,7 +10584,7 @@ HE5_PTwriteattrF(int pointID, const char
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTwritegrpattrF(int pointID, const char *attrname, int ntype, long fortcount[], void * datbuf)
+HE5_PTwritegrpattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void * datbuf)
 {
   int          ret        = FAIL;        /* (int) return status variable      */
   int	       rank       = 1;           /* Rank variable                     */
@@ -10739,7 +10739,7 @@ HE5_PTwritegrpattrF(int pointID, const c
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTwritelocattrF(int pointID, const char *levelname, const char *attrname, int ntype, long fortcount[],void * datbuf)
+HE5_PTwritelocattrF(hid_t pointID, const char *levelname, const char *attrname, int ntype, long fortcount[],void * datbuf)
 {
   int	       ret  = FAIL;             /* routine return status variable             */
   int 	       rank = 1;                /* Note: It is assumed that fortcout has just */
@@ -10893,7 +10893,7 @@ HE5_PTwritelocattrF(int pointID, const c
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTreadattrF(int pointID, const char *attrname, void *datbuf)
+HE5_PTreadattrF(hid_t pointID, const char *attrname, void *datbuf)
 {
   int         ret     = FAIL;/* routine return status variable  */
 
@@ -10949,7 +10949,7 @@ HE5_PTreadattrF(int pointID, const char
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTreadgrpattrF(int pointID, const char *attrname, void *datbuf)
+HE5_PTreadgrpattrF(hid_t pointID, const char *attrname, void *datbuf)
 {
   int         ret             = FAIL;   /* (int) return status      */
 
@@ -11004,7 +11004,7 @@ HE5_PTreadgrpattrF(int pointID, const ch
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTreadlocattrF(int pointID, const char *levelname, const char *attrname, void *datbuf)
+HE5_PTreadlocattrF(hid_t pointID, const char *levelname, const char *attrname, void *datbuf)
 {
   int         ret             =  FAIL;/* return status variable   */
 
@@ -11714,7 +11714,7 @@ HE5_PTgetfort_order(long *dims, int dim_
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTnrecsF(int pointID, int level)
+HE5_PTnrecsF(hid_t pointID, int level)
 { 
   hid_t           PointID = FAIL;/* HDF5 type point ID            */
 
@@ -11839,7 +11839,7 @@ HE5_PTnlevelsF(hid_t pointID)
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTnfieldsF(int pointID, int level, char *fieldlist, long *strbufsize)
+HE5_PTnfieldsF(hid_t pointID, int level, char *fieldlist, long *strbufsize)
 {
   hid_t           PointID  = FAIL;/* HDF5 type point ID            */
 
@@ -11904,7 +11904,7 @@ HE5_PTnfieldsF(int pointID, int level, c
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTlevelindxF(int pointID, const char *levelname)
+HE5_PTlevelindxF(hid_t pointID, const char *levelname)
 {
   hid_t           PointID = FAIL;/* HDF5 type point ID            */
 
@@ -11970,7 +11970,7 @@ HE5_PTlevelindxF(int pointID, const char
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTgetlevelnameF(int pointID, int  level, char *levelname, long *strbufsize)
+HE5_PTgetlevelnameF(hid_t pointID, int  level, char *levelname, long *strbufsize)
 {
   int             ret     = FAIL;
 
@@ -12040,7 +12040,7 @@ HE5_PTgetlevelnameF(int pointID, int  le
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTbcklinkinfoF(int pointID, int level, char *linkfield)
+HE5_PTbcklinkinfoF(hid_t pointID, int level, char *linkfield)
 {
   int             ret     = FAIL;
 
@@ -12108,7 +12108,7 @@ HE5_PTbcklinkinfoF(int pointID, int leve
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int   
-HE5_PTfwdlinkinfoF(int pointID, int level, char *linkfield)
+HE5_PTfwdlinkinfoF(hid_t pointID, int level, char *linkfield)
 {
   int             ret     = FAIL;
 
@@ -12185,7 +12185,7 @@ HE5_PTfwdlinkinfoF(int pointID, int leve
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int  
-HE5_PTlevelinfoF(int pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[])
+HE5_PTlevelinfoF(hid_t pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[])
 {
   herr_t            status = FAIL;/* routine return status variable */    
    
@@ -12311,7 +12311,7 @@ HE5_PTlevelinfoF(int pointID, int level,
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int   
-HE5_PTinqdatatypeF(int pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size)
+HE5_PTinqdatatypeF(hid_t pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size)
 {
   int	       ret      = FAIL;               /* (int) status variable  */
 
@@ -12500,7 +12500,7 @@ HE5_PTinqpointF(const char *filename, ch
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount)
+HE5_PTattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount)
 {
   int          ret      = FAIL;               /* (int) return status variable  */ 
 
@@ -12601,7 +12601,7 @@ HE5_PTattrinfoF(int pointID, const char
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int
-HE5_PTgrpattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount)
+HE5_PTgrpattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount)
 {
   int	      ret     = FAIL;	        /* (int) return status variable   */
 
@@ -12701,7 +12701,7 @@ HE5_PTgrpattrinfoF(int pointID, const ch
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int   
-HE5_PTlocattrinfoF(int pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount)
+HE5_PTlocattrinfoF(hid_t pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount)
 {
   int	      ret     = FAIL;	        /* (int) return status variable   */
 
@@ -12802,7 +12802,7 @@ HE5_PTlocattrinfoF(int pointID, const ch
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 long 
-HE5_PTinqattrsF(int pointID, char *attrnames, long *strbufsize)
+HE5_PTinqattrsF(hid_t pointID, char *attrnames, long *strbufsize)
 {
   long            nattr    = FAIL;/* Number of attributes (return)  */
 
@@ -12876,7 +12876,7 @@ HE5_PTinqattrsF(int pointID, char *attrn
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 long 
-HE5_PTinqgrpattrsF(int pointID, char *attrnames, long *strbufsize)
+HE5_PTinqgrpattrsF(hid_t pointID, char *attrnames, long *strbufsize)
 {
   long            nattr   = FAIL;         /* Number of attributes (return)  */
 
@@ -12947,7 +12947,7 @@ HE5_PTinqgrpattrsF(int pointID, char *at
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 long 
-HE5_PTinqlocattrsF(int pointID, const char *levelname, char *attrnames, long *strbufsize)
+HE5_PTinqlocattrsF(hid_t pointID, const char *levelname, char *attrnames, long *strbufsize)
 {
   long            nattr       = FAIL;     /* Number of attributes   */
 
@@ -13013,7 +13013,7 @@ HE5_PTinqlocattrsF(int pointID, const ch
 |  END_PROLOG                                                                 |
 -----------------------------------------------------------------------------*/
 int 
-HE5_PTnumtypeinfoF(int pointID, int level, int numtype[])
+HE5_PTnumtypeinfoF(hid_t pointID, int level, int numtype[])
 {
   herr_t            status = FAIL;/* routine return status variable */