mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-05 21:37:15 +02:00
63 lines
2.4 KiB
Diff
63 lines
2.4 KiB
Diff
diff --git a/h5_test/tst_h_files4.c b/h5_test/tst_h_files4.c
|
|
index 3e82f35..0e0f95b 100644
|
|
--- a/h5_test/tst_h_files4.c
|
|
+++ b/h5_test/tst_h_files4.c
|
|
@@ -164,7 +164,7 @@ main()
|
|
if (H5Gget_num_objs(grpid, &num_obj) < 0) ERR;
|
|
for (i = 0; i < num_obj; i++)
|
|
{
|
|
- if (H5Literate(grpid, H5_INDEX_CRT_ORDER, H5_ITER_INC, &idx, op_func,
|
|
+ if (H5Literate2(grpid, H5_INDEX_CRT_ORDER, H5_ITER_INC, &idx, op_func,
|
|
(void *)obj_name) != 1) ERR;
|
|
printf("encountered object %s\n", obj_name);
|
|
}
|
|
diff --git a/libhdf5/hdf5open.c b/libhdf5/hdf5open.c
|
|
index cb2491f..e80d776 100644
|
|
--- a/libhdf5/hdf5open.c
|
|
+++ b/libhdf5/hdf5open.c
|
|
@@ -2898,7 +2898,7 @@ rec_read_metadata(NC_GRP_INFO_T *grp)
|
|
* passed as a parameter to the callback function
|
|
* read_hdf5_obj(). (I have also tried H5Oiterate(), but it is much
|
|
* slower iterating over the same file - Ed.) */
|
|
- if (H5Literate(hdf5_grp->hdf_grpid, iter_index, H5_ITER_INC, &idx,
|
|
+ if (H5Literate2(hdf5_grp->hdf_grpid, iter_index, H5_ITER_INC, &idx,
|
|
read_hdf5_obj, (void *)&udata) < 0)
|
|
BAIL(NC_EHDFERR);
|
|
|
|
From 07134b9581e27db1fbf44495c05f7e4a57a82be3 Mon Sep 17 00:00:00 2001
|
|
From: Orion Poplawski <orion@nwra.com>
|
|
Date: Mon, 29 Jan 2024 22:05:11 -0700
|
|
Subject: [PATCH] Fix some variable types. Resolves #2849
|
|
|
|
---
|
|
libhdf4/hdf4file.c | 2 +-
|
|
ncgen/ncgen.h | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libhdf4/hdf4file.c b/libhdf4/hdf4file.c
|
|
index 3fd198a375..7fb0b3d103 100644
|
|
--- a/libhdf4/hdf4file.c
|
|
+++ b/libhdf4/hdf4file.c
|
|
@@ -485,7 +485,7 @@ hdf4_read_var(NC_FILE_INFO_T *h5, int v)
|
|
int32 sdsid;
|
|
int contiguous;
|
|
int d, a;
|
|
- int flag;
|
|
+ int32 flag;
|
|
char name[NC_MAX_HDF4_NAME+1];
|
|
int xtype;
|
|
char type_name[NC_MAX_NAME + 1];
|
|
diff --git a/ncgen/ncgen.h b/ncgen/ncgen.h
|
|
index 765543d043..f7f901671d 100644
|
|
--- a/ncgen/ncgen.h
|
|
+++ b/ncgen/ncgen.h
|
|
@@ -173,7 +173,7 @@ typedef struct Typeinfo {
|
|
int hasvlen; /* 1 => this type contains a vlen*/
|
|
nc_type typecode;
|
|
unsigned long offset; /* fields in struct*/
|
|
- unsigned long alignment;/* fields in struct*/
|
|
+ size_t alignment;/* fields in struct*/
|
|
NCConstant* econst; /* for enum values*/
|
|
Dimset dimset; /* for NC_VAR/NC_FIELD/NC_ATT*/
|
|
size_t size; /* for opaque, compound, etc.*/
|