diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-01-23 20:48:45 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-01-23 20:48:45 (GMT) |
| commit | 615a1fc7ec94b1c2f23fe3595033181afbf5a9e3 (patch) | |
| tree | 6bc13879c04b7e71f2b45b7670ad150a9b3dfffa /src/H5Gname.c | |
| parent | 313102f942252d948f5eb0e9b2246f295b3b9c76 (diff) | |
| download | hdf5-615a1fc7ec94b1c2f23fe3595033181afbf5a9e3.zip hdf5-615a1fc7ec94b1c2f23fe3595033181afbf5a9e3.tar.gz hdf5-615a1fc7ec94b1c2f23fe3595033181afbf5a9e3.tar.bz2 | |
[svn-r11888] Purpose:
Code cleanup
Description:
Check in some of the code cleanups from working on the external link
support. (This doesn't include any of the external link features)
Platforms tested:
FreeBSD 4.11 (sleipnir)
Mac OSX.4 (amazon)
Linux 2.4
Diffstat (limited to 'src/H5Gname.c')
| -rw-r--r-- | src/H5Gname.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Gname.c b/src/H5Gname.c index 7ca5045..a2e676e 100644 --- a/src/H5Gname.c +++ b/src/H5Gname.c @@ -170,7 +170,7 @@ H5G_build_fullpath(const char *prefix, const char *name) path_len += HDstrlen(name) + need_sep; /* Allocate space for the path */ - if(NULL == (full_path = H5FL_BLK_MALLOC(str_buf, path_len + 1))) + if(NULL == (full_path = (char *)H5FL_BLK_MALLOC(str_buf, path_len + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Build full path */ @@ -369,7 +369,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size) if(name) { HDstrncpy(name, H5RS_get_str(ent->user_path_r), MIN(len + 1, size)); if(len >= size) - name[size-1]='\0'; + name[size-1] = '\0'; } /* end if */ } /* end if */ } /* end if */ @@ -494,7 +494,7 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char /* Allocate space for the new path */ new_path_len = path_prefix2_len + HDstrlen(dst_suffix) + full_suffix_len; - if(NULL == (new_path = H5FL_BLK_MALLOC(str_buf, new_path_len + 1))) + if(NULL == (new_path = (char *)H5FL_BLK_MALLOC(str_buf, new_path_len + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Create the new path */ @@ -620,7 +620,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) /* Allocate space for the new full path */ new_full_len = HDstrlen(src_path) + HDstrlen(full_path); - if(NULL == (new_full_path = H5FL_BLK_MALLOC(str_buf, new_full_len + 1))) + if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Create the new full path */ @@ -666,7 +666,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) /* Build new full path */ /* Create the new full path */ - if(NULL == (new_full_path = H5FL_BLK_MALLOC(str_buf, HDstrlen(full_suffix) + 1))) + if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, HDstrlen(full_suffix) + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") HDstrcpy(new_full_path, full_suffix); @@ -752,7 +752,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key) /* Allocate space for the new full path */ new_full_len = HDstrlen(dst_path) + HDstrlen(full_suffix); - if(NULL == (new_full_path = H5FL_BLK_MALLOC(str_buf, new_full_len + 1))) + if(NULL == (new_full_path = (char *)H5FL_BLK_MALLOC(str_buf, new_full_len + 1))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed") /* Create the new full path */ |