mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r20778] I changed the macro definition of DIR_SEPC and DIR_SEPS to ']' for OpenVMS in H5private.h. Strictly speaking, it isn't

Browse Source 
the directory seperator.  But it can simplify the code and make the H5L_build_name function cleaner.  

Tested on jam because the change only affects VMS.
This commit is contained in:
Raymond Lu 2011-05-09 15:31:43 -05:00
parent a4c349dece
commit 4e5f011c34
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5Fefc.c
View File

@ -147,7 +147,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
H5F_efc_t *efc = NULL; /* External file cache for parent file */
H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */
hbool_t open_file = FALSE; /* Whether ent->file needs to be closed in case of error */
H5F_t *ret_value; /* Return value */
H5F_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_open)

3
src/H5Lexternal.c
View File

@ -146,10 +146,9 @@ H5L_build_name(char *prefix, char *file_name, char **full_name/*out*/)
/* Copy the prefix into the buffer */
HDstrcpy(*full_name, prefix);
#ifndef H5_VMS
if (!CHECK_DELIMITER(prefix[prefix_len-1]))
HDstrcat(*full_name, DIR_SEPS);
#endif
/* Add the external link's filename to the prefix supplied */
HDstrcat(*full_name, file_name);

10
src/H5private.h
View File

@ -1475,13 +1475,13 @@ extern char *strdup(const char *s);
/* OpenVMS pathname: <disk name>$<partition>:[path]<file name>
* i.g. SYS$SYSUSERS:[LU.HDF5.SRC]H5system.c */
#define DIR_SEPC '.'
#define DIR_SEPS "."
#define DIR_SEPC ']'
#define DIR_SEPS "]"
#define CHECK_DELIMITER(SS) (SS == DIR_SEPC)
#define CHECK_ABSOLUTE(NAME) (strrchr(NAME, ':') && strrchr(NAME, '['))
#define CHECK_ABS_DRIVE(NAME) (0)
#define CHECK_ABS_PATH(NAME) (0)
#define GET_LAST_DELIMITER(NAME, ptr) ptr = strrchr(NAME, ']');
#define CHECK_ABS_DRIVE(NAME) (0)
#define CHECK_ABS_PATH(NAME) (0)
#define GET_LAST_DELIMITER(NAME, ptr) ptr = strrchr(NAME, DIR_SEPC);
#else