diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/h5_elink_unix2win.c | 20 | ||||
| -rw-r--r-- | examples/h5_extlink.c | 52 |
2 files changed, 40 insertions, 32 deletions
diff --git a/examples/h5_elink_unix2win.c b/examples/h5_elink_unix2win.c index ef38626..abf7512 100644 --- a/examples/h5_elink_unix2win.c +++ b/examples/h5_elink_unix2win.c @@ -39,12 +39,12 @@ * Note that this may not be necessary on your system; many Windows systems can * understand Unix paths. */ -static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, void * udata, size_t udata_size, hid_t lapl_id) +static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id) { hid_t fid; - char *file_name = NULL; - char *obj_name; - char *elink_prefix; /* External link prefix */ + const char *file_name; + const char *obj_name; char *new_fname = NULL; /* Buffer allocated to hold Unix file path */ ssize_t prefix_len; /* External link prefix length */ size_t fname_len; @@ -54,7 +54,7 @@ static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, void * printf("Converting Unix path to Windows path.\n"); - if(H5Lunpack_elink_val(udata, udata_size, &file_name, &obj_name) < 0) + if(H5Lunpack_elink_val(udata, udata_size, NULL, &file_name, &obj_name) < 0) goto error; fname_len = strlen(file_name); @@ -71,7 +71,7 @@ static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, void * new_fname = malloc(prefix_len + fname_len + 1); /* Copy the prefix into the buffer */ - if(H5Pget_elink_prefix(lapl_id, new_fname, prefix_len + 1) < 0) + if(H5Pget_elink_prefix(lapl_id, new_fname, (size_t)(prefix_len + 1)) < 0) goto error; start_pos = prefix_len; @@ -102,16 +102,14 @@ static hid_t elink_unix2win_trav(const char *link_name, hid_t cur_group, void * if(H5Fclose(fid) < 0) goto error; - /* Free file names if they've been allocated */ + /* Free file name if it's been allocated */ if(new_fname) free(new_fname); - if(file_name) - free(file_name); return ret_value; error: - /* Free file_name if it's been allocated */ + /* Free file name if it's been allocated */ if(new_fname) free(new_fname); return -1; @@ -138,7 +136,7 @@ const H5L_class_t elink_unix2win_class[1] = {{ * follows the external link to open the target file. */ static int -unix2win_example() +unix2win_example(void) { hid_t fid = (-1); /* File ID */ hid_t gid = (-1); /* Group ID */ diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c index 121e0a8..dd5a834 100644 --- a/examples/h5_extlink.c +++ b/examples/h5_extlink.c @@ -51,7 +51,7 @@ * Creates two files and uses an external link to access an object in the * second file from the first file. */ -void extlink_example(void) +static void extlink_example(void) { hid_t source_file_id, targ_file_id; hid_t group_id, group2_id; @@ -111,7 +111,7 @@ void extlink_example(void) * where it is run (so to run this example on Unix, first mkdir red and mkdir * blue). */ -void extlink_prefix_example(void) +static void extlink_prefix_example(void) { hid_t source_file_id, red_file_id, blue_file_id; hid_t group_id, group2_id; @@ -209,9 +209,10 @@ void extlink_prefix_example(void) * We might also have wanted to supply a creation callback that checks * that a path was supplied in the udata. */ -static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, void *udata, size_t udata_size, hid_t lapl_id); +static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id); -void soft_link_example(void) +static void soft_link_example(void) { hid_t file_id; hid_t group_id; @@ -276,9 +277,11 @@ void soft_link_example(void) * The actual traversal function simply needs to open the correct object by * name and return its ID. */ -static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, void *udata, size_t udata_size, hid_t lapl_id) + +static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id) { - const char *target = (char *) udata; + const char *target = (const char *) udata; hid_t ret_value; /* Pass the udata straight through to HDF5. If it's invalid, let HDF5 @@ -288,7 +291,6 @@ static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, void *udat return ret_value; } - /* Hard Link example * @@ -305,11 +307,14 @@ static hid_t UD_soft_traverse(const char *link_name, hid_t cur_group, void *udat * To keep the example simple, these links don't have a query callback. * Generally, real link classes should always be query-able. */ -static herr_t UD_hard_create(const char *link_name, hid_t loc_group, void *udata, size_t udata_size, hid_t lcpl_id); -static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, void *udata, size_t udata_size); -static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, void *udata, size_t udata_size, hid_t lapl_id); - -void hard_link_example(void) +static herr_t UD_hard_create(const char *link_name, hid_t loc_group, + const void *udata, size_t udata_size, hid_t lcpl_id); +static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, + const void *udata, size_t udata_size); +static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id); + +static void hard_link_example(void) { hid_t file_id; hid_t group_id; @@ -398,7 +403,8 @@ void hard_link_example(void) * If this function returns a negative value, the call to H5Lcreate_ud() * will also return failure and the link will not be created. */ -static herr_t UD_hard_create(const char *link_name, hid_t loc_group, void *udata, size_t udata_size, hid_t lcpl_id) +static herr_t UD_hard_create(const char *link_name, hid_t loc_group, + const void *udata, size_t udata_size, hid_t lcpl_id) { haddr_t addr; hid_t target_obj = -1; @@ -411,7 +417,7 @@ static herr_t UD_hard_create(const char *link_name, hid_t loc_group, void *udata goto done; } - addr = *((haddr_t *) udata); + addr = *((const haddr_t *) udata); /* Open the object this link points to so that we can increment * its reference count. This also ensures that the address passed @@ -441,7 +447,8 @@ done: * Since the creation function increments the object's reference count, it's * important to decrement it again when the link is deleted. */ -static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, void *udata, size_t udata_size) +static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, + const void *udata, size_t udata_size) { haddr_t addr; hid_t target_obj = -1; @@ -456,7 +463,7 @@ static herr_t UD_hard_delete(const char *link_name, hid_t loc_group, void *udata goto done; } - addr = *((haddr_t *) udata); + addr = *((const haddr_t *) udata); /* Open the object this link points to */ target_obj= H5Oopen_by_addr(loc_group, addr); @@ -484,7 +491,8 @@ done: * The actual traversal function simply needs to open the correct object and * return its ID. */ -static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, void * udata, size_t udata_size, hid_t lapl_id) +static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id) { haddr_t addr; hid_t ret_value = -1; @@ -495,7 +503,7 @@ static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, void * uda if(udata_size != sizeof(haddr_t)) return -1; - addr = *((haddr_t *) udata); + addr = *((const haddr_t *) udata); /* Open the object by address. If H5Oopen_by_addr fails, ret_value will * be negative to indicate that the traversal function failed. @@ -520,9 +528,10 @@ static hid_t UD_hard_traverse(const char *link_name, hid_t cur_group, void * uda * These are defined after the example below. * These links have no udata, so they don't need a query function. */ -static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group, void *udata, size_t udata_size, hid_t lapl_id); +static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id); -void plist_link_example(void) +static void plist_link_example(void) { hid_t file_id; hid_t group_id, group2_id; @@ -610,7 +619,8 @@ void plist_link_example(void) /* UD_plist_traverse * Open a path passed in through the property list. */ -static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group, void * udata, size_t udata_size, hid_t lapl_id) +static hid_t UD_plist_traverse(const char *link_name, hid_t cur_group, + const void *udata, size_t udata_size, hid_t lapl_id) { char * path; hid_t ret_value = -1; |