diff options
| -rw-r--r-- | perform/zip_perf.c | 6 | ||||
| -rw-r--r-- | src/H5O.c | 4 | ||||
| -rw-r--r-- | src/H5Opkg.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perform/zip_perf.c b/perform/zip_perf.c index b005528..37f264a 100644 --- a/perform/zip_perf.c +++ b/perform/zip_perf.c @@ -322,7 +322,7 @@ uncompress_buffer(Bytef *dest, uLongf *destLen, const Bytef *source, static void get_unique_name(void) { - const char *prefix = "/tmp", *template = "/zip_perf.data"; + const char *prefix = "/tmp", *tmpl = "/zip_perf.data"; const char *env = getenv("HDF5_PREFIX"); if (env) @@ -331,13 +331,13 @@ get_unique_name(void) if (option_prefix) prefix = option_prefix; - filename = calloc(1, strlen(prefix) + strlen(template) + 1); + filename = calloc(1, strlen(prefix) + strlen(tmpl) + 1); if (!filename) error("out of memory"); strcpy(filename, prefix); - strcat(filename, template); + strcat(filename, tmpl); } /* @@ -3173,7 +3173,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh) type = curr_msg->type; /* Check if there is a file space deletion callback for this type of message */ - if(type->delete) { + if(type->del) { /* * Decode the message if necessary. */ @@ -3184,7 +3184,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh) HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "unable to decode message"); } /* end if */ - if ((type->delete)(f, dxpl_id, curr_msg->native)<0) + if ((type->del)(f, dxpl_id, curr_msg->native)<0) HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message"); } /* end if */ } /* end for */ diff --git a/src/H5Opkg.h b/src/H5Opkg.h index ceb4ae3..1255764 100644 --- a/src/H5Opkg.h +++ b/src/H5Opkg.h @@ -66,7 +66,7 @@ typedef struct H5O_class_t { size_t (*raw_size)(H5F_t*, const void*);/*sizeof raw val */ herr_t (*reset)(void *); /*free nested data structs */ herr_t (*free)(void *); /*free main data struct */ - herr_t (*delete)(H5F_t *, hid_t, const void *); /* Delete space in file referenced by this message */ + herr_t (*del)(H5F_t *, hid_t, const void *); /* Delete space in file referenced by this message */ herr_t (*get_share)(H5F_t*, const void*, struct H5O_shared_t*); /* Get shared information */ herr_t (*set_share)(H5F_t*, void*, const struct H5O_shared_t*); /* Set shared information */ herr_t (*debug)(H5F_t*, hid_t, const void*, FILE*, int, int); |