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
|
commit be29ddf0352bc8e5a7eecc8772a3acb64dfde18c
Author: miller86 <miller86@llnl.gov>
Date: Fri Dec 2 19:00:20 2022 -0800
fix obj-case-macro
diff --git src/hdf5_drv/silo_hdf5.c src/hdf5_drv/silo_hdf5.c
index 17af250..c45d689 100644
--- src/hdf5_drv/silo_hdf5.c
+++ src/hdf5_drv/silo_hdf5.c
@@ -1809,7 +1809,7 @@ db_hdf5_cwg(DBfile *_dbfile)
*dscount = m.MEMCNT; \
*dsnames = (char **) calloc(*dscount, sizeof(char**)); \
for (i = 0; i < *dscount; i++) \
- (*dsnames)[i] = strdup(m.MEMNAME[i]); \
+ (*dsnames)[i] = strdup(m.MEMNAME); \
break; \
}
@@ -1857,15 +1857,15 @@ db_hdf5_get_obj_dsnames(DBfile *_dbfile, char const *name, int *dscount, char **
switch(_objtype)
{
- DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value)
- /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord) wont work for rect case */
- DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord)
- DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord)
- DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value)
- DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord)
- DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data)
- DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord)
- DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals)
+ DB_OBJ_CASE(DB_QUADVAR, DBquadvar_mt, nvals, value[i])
+ /*DB_OBJ_CASE(DB_QUAD_RECT, DBquadmesh_mt, nspace, coord[i]) wont work for rect case */
+ DB_OBJ_CASE(DB_QUAD_CURV, DBquadmesh_mt, nspace, coord[i])
+ DB_OBJ_CASE(DB_QUADMESH, DBquadmesh_mt, nspace, coord[i])
+ DB_OBJ_CASE(DB_UCDVAR, DBucdvar_mt, nvals, value[i])
+ DB_OBJ_CASE(DB_UCDMESH, DBucdmesh_mt, ndims, coord[i])
+ DB_OBJ_CASE(DB_POINTVAR, DBpointvar_mt, nvals, data[i])
+ DB_OBJ_CASE(DB_POINTMESH, DBpointmesh_mt, ndims, coord[i])
+ DB_OBJ_CASE(DB_CSGVAR, DBcsgvar_mt, nvals, vals[i])
DB_OBJ_CASE(DB_CURVE, DBcurve_mt, npts?1:1, yvarname)
}
H5Tclose(o);
|
