diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-21 20:30:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-08-21 20:30:19 (GMT) |
| commit | f8a796ebfc24c8f5f2c2c4f592234deb2b225c09 (patch) | |
| tree | b68f1de29b43ba1d654d9b8c7c05e23db9a1b15d /src/H5Lexternal.c | |
| parent | 5f7de916882208cd9f3b3490c59e0f3ab92cdc40 (diff) | |
| download | hdf5-f8a796ebfc24c8f5f2c2c4f592234deb2b225c09.zip hdf5-f8a796ebfc24c8f5f2c2c4f592234deb2b225c09.tar.gz hdf5-f8a796ebfc24c8f5f2c2c4f592234deb2b225c09.tar.bz2 | |
[svn-r15510] Description:
Clean up warnings & formatting
Tested on:
Mac OS X/32 10.5.4 (amazon)
More tests forthcoming
Diffstat (limited to 'src/H5Lexternal.c')
| -rw-r--r-- | src/H5Lexternal.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index ac4fe17..1830097 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -107,9 +107,9 @@ H5L_getenv_prefix_name(char **env_prefix/*in,out*/) *env_prefix = strret + 1; *strret = '\0'; } - return(retptr); + FUNC_LEAVE_NOAPI(retptr) -} +} /* end H5L_getenv_prefix_name() */ /*-------------------------------------------------------------------------- @@ -135,7 +135,7 @@ H5L_build_name(char *prefix, char *file_name, char **full_name/*out*/) fname_len = HDstrlen(file_name); /* Allocate a buffer to hold the filename + prefix + possibly the delimiter + terminating null byte */ - if(NULL == (*full_name = H5MM_malloc(prefix_len + fname_len + 2))) + if(NULL == (*full_name = (char *)H5MM_malloc(prefix_len + fname_len + 2))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate filename buffer") /* Copy the prefix into the buffer */ @@ -471,7 +471,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name, HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate udata buffer") /* Encode the external link information */ - p = ext_link_buf; + p = (uint8_t *)ext_link_buf; *p++ = (H5L_EXT_VERSION << 4) | H5L_EXT_FLAGS_ALL; /* External link version & flags */ HDstrcpy((char *)p, file_name); /* Name of file containing external link's object */ p += HDstrlen(file_name) + 1; |