From c6a9948a8e7e8437f69342e0dc79d7ffd75455b8 Mon Sep 17 00:00:00 2001 From: Ed Hartnett Date: Sun, 20 Jan 2019 09:37:13 -0700 Subject: [PATCH] removed unneeded var, fixed broken log statements that cause segfaults --- libhdf5/hdf5file.c | 7 +++-- libsrc4/nc4internal.c | 59 ++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libhdf5/hdf5file.c b/libhdf5/hdf5file.c index 411ece277..a40c3b767 100644 --- a/libhdf5/hdf5file.c +++ b/libhdf5/hdf5file.c @@ -539,7 +539,7 @@ NC4_enddef(int ncid) LOG((1, "%s: ncid 0x%x", __func__, ncid)); /* Find pointer to group and nc4_info. */ - if ((retval = nc4_find_nc_grp_h5(ncid, NULL, &grp, &nc4_info))) + if ((retval = nc4_find_grp_h5(ncid, &grp, &nc4_info))) return retval; /* When exiting define mode, mark all variable written. */ @@ -650,7 +650,6 @@ int NC4_close(int ncid, void* params) { NC_GRP_INFO_T *grp; - NC *nc; NC_FILE_INFO_T *h5; int retval; int inmemory; @@ -659,10 +658,10 @@ NC4_close(int ncid, void* params) LOG((1, "%s: ncid 0x%x", __func__, ncid)); /* Find our metadata for this file. */ - if ((retval = nc4_find_nc_grp_h5(ncid, &nc, &grp, &h5))) + if ((retval = nc4_find_grp_h5(ncid, &grp, &h5))) return retval; - assert(nc && h5 && grp); + assert(h5 && grp); /* This must be the root group. */ if (grp->parent) diff --git a/libsrc4/nc4internal.c b/libsrc4/nc4internal.c index 5d73f4e6d..80db5bcdd 100644 --- a/libsrc4/nc4internal.c +++ b/libsrc4/nc4internal.c @@ -1431,12 +1431,11 @@ nc_set_log_level(int new_level) * @param tab_count Number of tabs. * * @return ::NC_NOERR No error. - * @author Ed Hartnett + * @author Ed Hartnett, Dennis Heimbigner */ static int rec_print_metadata(NC_GRP_INFO_T *grp, int tab_count) { - NC_GRP_INFO_T *g; NC_ATT_INFO_T *att; NC_VAR_INFO_T *var; NC_DIM_INFO_T *dim; @@ -1455,28 +1454,31 @@ rec_print_metadata(NC_GRP_INFO_T *grp, int tab_count) LOG((2, "%s GROUP - %s nc_grpid: %d nvars: %d natts: %d", tabs, grp->hdr.name, grp->hdr.id, ncindexsize(grp->vars), ncindexsize(grp->att))); - for(i=0;iatt);i++) { - att = (NC_ATT_INFO_T*)ncindexith(grp->att,i); - if(att == NULL) continue; + for (i = 0; i < ncindexsize(grp->att); i++) + { + att = (NC_ATT_INFO_T *)ncindexith(grp->att, i); + assert(att); LOG((2, "%s GROUP ATTRIBUTE - attnum: %d name: %s type: %d len: %d", tabs, att->hdr.id, att->hdr.name, att->nc_typeid, att->len)); } - for(i=0;idim);i++) { - dim = (NC_DIM_INFO_T*)ncindexith(grp->dim,i); - if(dim == NULL) continue; + for (i = 0; i < ncindexsize(grp->dim); i++) + { + dim = (NC_DIM_INFO_T *)ncindexith(grp->dim, i); + assert(dim); LOG((2, "%s DIMENSION - dimid: %d name: %s len: %d unlimited: %d", tabs, dim->hdr.id, dim->hdr.name, dim->len, dim->unlimited)); } - for(i=0;ivars);i++) + for (i = 0; i < ncindexsize(grp->vars); i++) { int j; var = (NC_VAR_INFO_T*)ncindexith(grp->vars,i); - if (var == NULL) continue; - if(var->ndims > 0) + assert(var); + if (var->ndims > 0) { - dims_string = (char*)malloc(sizeof(char)*(var->ndims*4)); + if (!(dims_string = malloc(sizeof(char) * var->ndims * 4))) + return NC_ENOMEM; strcpy(dims_string, ""); for (d = 0; d < var->ndims; d++) { @@ -1487,31 +1489,31 @@ rec_print_metadata(NC_GRP_INFO_T *grp, int tab_count) LOG((2, "%s VARIABLE - varid: %d name: %s ndims: %d dimscale: %d dimids:%s", tabs, var->hdr.id, var->hdr.name, var->ndims, (int)var->dimscale, (dims_string ? dims_string : " -"))); - for(j=0;jatt);j++) { - att = (NC_ATT_INFO_T*)ncindexith(var->att,j); - if(att == NULL) continue; + for (j = 0; j < ncindexsize(var->att); j++) + { + att = (NC_ATT_INFO_T *)ncindexith(var->att, j); + assert(att); LOG((2, "%s VAR ATTRIBUTE - attnum: %d name: %s type: %d len: %d", tabs, att->hdr.id, att->hdr.name, att->nc_typeid, att->len)); } - if(dims_string) - { + if (dims_string) free(dims_string); - dims_string = NULL; - } } - for(i=0;itype);i++) + for (i = 0; i < ncindexsize(grp->type); i++) { - if((type = (NC_TYPE_INFO_T*)ncindexith(grp->type,i)) == NULL) continue; - LOG((2, "%s TYPE - nc_typeid: %d committed: %d name: %s num_fields: %d", + type = (NC_TYPE_INFO_T*)ncindexith(grp->type, i); + assert(type); + LOG((2, "%s TYPE - nc_typeid: %d size: %d committed: %d name: %s", tabs, type->hdr.id, type->size, (int)type->committed, type->hdr.name)); /* Is this a compound type? */ if (type->nc_type_class == NC_COMPOUND) { int j; LOG((3, "compound type")); - for(j=0;ju.c.field);j++) { - field = (NC_FIELD_INFO_T*)nclistget(type->u.c.field,j); + for (j = 0; j < nclistlength(type->u.c.field); j++) + { + field = (NC_FIELD_INFO_T *)nclistget(type->u.c.field, j); LOG((4, "field %s offset %d nctype %d ndims %d", field->hdr.name, field->offset, field->nc_typeid, field->ndims)); } @@ -1536,12 +1538,11 @@ rec_print_metadata(NC_GRP_INFO_T *grp, int tab_count) } /* Call self for each child of this group. */ - for(i=0;ichildren);i++) - { - if((g = (NC_GRP_INFO_T*)ncindexith(grp->children,i)) == NULL) continue; - if ((retval = rec_print_metadata(g, tab_count + 1))) + for (i = 0; i < ncindexsize(grp->children); i++) + if ((retval = rec_print_metadata((NC_GRP_INFO_T *)ncindexith(grp->children, i), + tab_count + 1))) return retval; - } + return NC_NOERR; }