diff options
Diffstat (limited to 'hl/src/H5LD.c')
-rw-r--r-- | hl/src/H5LD.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/hl/src/H5LD.c b/hl/src/H5LD.c index 65a15e3..d85ef76 100644 --- a/hl/src/H5LD.c +++ b/hl/src/H5LD.c @@ -43,12 +43,12 @@ H5LD_clean_vector(H5LD_memb_t *listv[]) { unsigned n; /* Local index variable */ - HDassert(listv); + assert(listv); /* Go through info for each field stored in listv[] */ for (n = 0; listv[n] != NULL; n++) { if (listv[n]->names) { - HDfree(listv[n]->names); + free(listv[n]->names); listv[n]->names = NULL; } /* end if */ @@ -59,7 +59,7 @@ H5LD_clean_vector(H5LD_memb_t *listv[]) } /* end if */ /* Free the H5LD_memb_t structure for the field */ - HDfree(listv[n]); + free(listv[n]); listv[n] = NULL; } /* end for */ } /* H5LD_clean_vector() */ @@ -154,13 +154,13 @@ done: int H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) { - int nfields; /* The # of comma-separated fields in "fields" */ - hbool_t end_of_fields = FALSE; /* end of "fields" */ - char *fields_ptr; /* Pointer to "fields" */ - int ret_value = FAIL; /* Return value */ + int nfields; /* The # of comma-separated fields in "fields" */ + bool end_of_fields = false; /* end of "fields" */ + char *fields_ptr; /* Pointer to "fields" */ + int ret_value = FAIL; /* Return value */ - HDassert(listv); - HDassert(fields); + assert(listv); + assert(fields); fields_ptr = fields; nfields = 0; @@ -170,19 +170,19 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) H5LD_memb_t *memb = NULL; /* Pointer to structure for storing a field's info */ char *cur; /* Pointer to a member in a field */ size_t len; /* Estimated # of members in a field */ - hbool_t gotcomma = FALSE; /* A comma encountered */ - hbool_t gotmember = FALSE; /* Getting member in a field */ - hbool_t valid = TRUE; /* Whether a field being processed is valid or not */ + bool gotcomma = false; /* A comma encountered */ + bool gotmember = false; /* Getting member in a field */ + bool valid = true; /* Whether a field being processed is valid or not */ int j = 0; /* The # of members in a field */ - len = (HDstrlen(fields_ptr) / 2) + 2; + len = (strlen(fields_ptr) / 2) + 2; /* Allocate memory for an H5LD_memb_t for storing a field's info */ - if (NULL == (memb = (H5LD_memb_t *)HDcalloc((size_t)1, sizeof(H5LD_memb_t)))) + if (NULL == (memb = (H5LD_memb_t *)calloc((size_t)1, sizeof(H5LD_memb_t)))) goto done; /* Allocate memory for an array of pointers to member names */ - if (NULL == (memb->names = (char **)HDcalloc(len, sizeof(char *)))) + if (NULL == (memb->names = (char **)calloc(len, sizeof(char *)))) goto done; memb->names[j] = fields_ptr; @@ -198,17 +198,17 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) memb->names[++j] = NULL; } /* end if */ else /* getting nothing but end of list */ - valid = FALSE; - end_of_fields = TRUE; + valid = false; + end_of_fields = true; break; case '\\': /* escape character */ ++fields_ptr; /* skip it */ if (*fields_ptr == '\0') - valid = FALSE; + valid = false; else { *cur++ = *fields_ptr++; - gotmember = TRUE; + gotmember = true; } /* end else */ break; @@ -216,26 +216,26 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) *fields_ptr++ = *cur++ = '\0'; if (gotmember) { memb->names[++j] = cur; - gotmember = FALSE; + gotmember = false; } /* end if */ else - valid = FALSE; + valid = false; break; case ',': /* field separator */ *fields_ptr++ = *cur++ = '\0'; if (gotmember) { memb->names[++j] = NULL; - gotmember = FALSE; + gotmember = false; } /* end if */ else - valid = FALSE; - gotcomma = TRUE; + valid = false; + gotcomma = true; break; default: *cur++ = *fields_ptr++; - gotmember = TRUE; + gotmember = true; break; } /* end switch */ } /* while (valid && !gotcomma && !end_of_fields) */ @@ -248,8 +248,8 @@ H5LD_construct_vector(char *fields, H5LD_memb_t *listv[] /*OUT*/, hid_t par_tid) } /* end if */ else { if (memb) { - HDfree(memb->names); - HDfree(memb); + free(memb->names); + free(memb); } goto done; } /* end else */ @@ -347,7 +347,7 @@ H5LD_get_dset_type_size(hid_t did, const char *fields) size_t tot = 0; /* Data type size of all the fields in "fields" */ int n = 0, num = 0; /* Local index variables */ - HDassert(fields && *fields); + assert(fields && *fields); /* Should be a compound datatype if "fields" exists */ if (H5Tget_class(dset_tid) != H5T_COMPOUND) @@ -358,8 +358,8 @@ H5LD_get_dset_type_size(hid_t did, const char *fields) goto done; /* Allocate memory for a list of H5LD_memb_t pointers to store "fields" info */ - len = (HDstrlen(fields) / 2) + 2; - if (NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *)))) + len = (strlen(fields) / 2) + 2; + if (NULL == (listv = (H5LD_memb_t **)calloc(len, sizeof(H5LD_memb_t *)))) goto done; /* Process and store info for "fields" */ @@ -385,11 +385,11 @@ done: /* Free the array of H5LD_memb_t pointers */ if (listv) - HDfree(listv); + free(listv); /* Free memory */ if (dup_fields) - HDfree(dup_fields); + free(dup_fields); return (ret_value); } /* H5LD_get_dset_type_size() */ @@ -437,8 +437,8 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims goto done; /* Verify that cur_dims must have one dimension whose size is greater than prev_dims */ - HDmemset(start, 0, sizeof start); - HDmemset(count, 0, sizeof count); + memset(start, 0, sizeof start); + memset(count, 0, sizeof count); ctr = 0; for (i = 0; i < ndims; i++) if (cur_dims[i] > prev_dims[i]) { @@ -459,7 +459,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims goto done; } /* end if */ else { /* changes for more than one dimensions */ - HDmemset(start, 0, sizeof start); + memset(start, 0, sizeof start); /* Make the selection in the dataset based on "cur_dims" and "prev_dims" */ if (H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, cur_dims, NULL) < 0) @@ -503,7 +503,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims goto done; /* Allocate memory for reading in the elements in the dataset selection */ - if (NULL == (sav_buf = tmp_buf = (char *)HDcalloc((size_t)num_elmts, tot_tsize))) + if (NULL == (sav_buf = tmp_buf = (char *)calloc((size_t)num_elmts, tot_tsize))) goto done; /* Read the dataset elements in the selection */ @@ -515,8 +515,8 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims goto done; /* Allocate memory for the vector of H5LD_memb_t pointers */ - len = (HDstrlen(fields) / 2) + 2; - if (NULL == (listv = (H5LD_memb_t **)HDcalloc(len, sizeof(H5LD_memb_t *)))) + len = (strlen(fields) / 2) + 2; + if (NULL == (listv = (H5LD_memb_t **)calloc(len, sizeof(H5LD_memb_t *)))) goto done; /* Process and store information for "fields" */ @@ -529,7 +529,7 @@ H5LD_get_dset_elmts(hid_t did, const hsize_t *prev_dims, const hsize_t *cur_dims /* Copy data for "fields" to the input buffer */ for (j = 0; listv[j] != NULL; j++) { - HDmemcpy(buf_p, tmp_buf + listv[j]->tot_offset, listv[j]->last_tsize); + memcpy(buf_p, tmp_buf + listv[j]->tot_offset, listv[j]->last_tsize); buf_p += listv[j]->last_tsize; } /* end for */ tmp_buf += tot_tsize; @@ -552,13 +552,13 @@ done: /* Free the array of H5LD_memb_t pointers */ if (listv) - HDfree(listv); + free(listv); /* Free memory */ if (dup_fields) - HDfree(dup_fields); + free(dup_fields); if (sav_buf) - HDfree(sav_buf); + free(sav_buf); return (ret_value); } /* H5LD_get_dset_elmts() */ |