summaryrefslogtreecommitdiffstats
path: root/src/H5RS.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-11-15 02:55:39 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-11-15 02:55:39 (GMT)
commita1708eb023f2c8f8ac6c2c17bf1e598c8dff956e (patch)
tree34c87a3753b36c4c8d689d58bf456eaf261cd235 /src/H5RS.c
parentbea1e576c5ef5500678f7ce913d835341b625e8f (diff)
downloadhdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.zip
hdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.tar.gz
hdf5-a1708eb023f2c8f8ac6c2c17bf1e598c8dff956e.tar.bz2
[svn-r11712] Purpose:
New feature Description: Check in baseline for compact group revisions, which radically revises the source code for managing groups and object headers. WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! This initiates the "unstable" phase of the 1.7.x branch, leading up to the 1.8.0 release. Please test this code, but do _NOT_ keep files created with it - the format will change again before the release and you will not be able to read your old files!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! WARNING!!!! Solution: There's too many changes to really describe them all, but some of them include: - Stop abusing the H5G_entry_t structure and split it into two separate structures for non-symbol table node use within the library: H5O_loc_t for object locations in a file and H5G_name_t to store the path to an opened object. H5G_entry_t is now only used for storing symbol table entries on disk. - Retire H5G_namei() in favor of a more general mechanism for traversing group paths and issuing callbacks on objects located. This gets us out of the business of hacking H5G_namei() for new features, generally. - Revised H5O* routines to take a H5O_loc_t instead of H5G_entry_t - Lots more... Platforms tested: h5committested and maybe another dozen configurations.... :-)
Diffstat (limited to 'src/H5RS.c')
-rw-r--r--src/H5RS.c64
1 files changed, 56 insertions, 8 deletions
diff --git a/src/H5RS.c b/src/H5RS.c
index 7d5bbfe..469ef4e 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -62,17 +62,17 @@ H5RS_xstrdup(const char *s)
{
char *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5RS_xstrdup);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_xstrdup)
- if (s) {
- ret_value = H5FL_BLK_MALLOC(str_buf,HDstrlen(s) + 1);
- assert (ret_value);
+ if(s) {
+ ret_value = H5FL_BLK_MALLOC(str_buf, HDstrlen(s) + 1);
+ HDassert(ret_value);
HDstrcpy(ret_value, s);
} /* end if */
else
- ret_value=NULL;
+ ret_value = NULL;
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5RS_xstrdup() */
@@ -160,7 +160,7 @@ done:
NAME
H5RS_own
PURPOSE
- Transfer ownership of a regular string to a reference counted string
+ Transfer ownership of a regular string to a reference counted string
USAGE
H5RS_str_t *H5RS_own(s)
const char *s; IN: String to transfer ownership of
@@ -286,7 +286,7 @@ H5RS_incr(H5RS_str_t *rs)
PURPOSE
"Duplicate" a ref-counted string
USAGE
- H5RS_str_t H5RS_incr(rs)
+ H5RS_str_t H5RS_dup(rs)
H5RS_str_t *rs; IN/OUT: Ref-counted string to "duplicate"
RETURNS
@@ -315,6 +315,54 @@ H5RS_dup(H5RS_str_t *ret_value)
/*--------------------------------------------------------------------------
NAME
+ H5RS_dup
+ PURPOSE
+ "Duplicate" a regular string into a ref-counted string
+ USAGE
+ H5RS_str_t H5RS_dup_str(s)
+ const char *s; IN: Regular string to duplicate
+
+ RETURNS
+ Returns a pointer to ref-counted string on success, NULL on failure.
+ DESCRIPTION
+ Duplicate a regular string into a ref-counted string.
+ GLOBAL VARIABLES
+ COMMENTS, BUGS, ASSUMPTIONS
+ EXAMPLES
+ REVISION LOG
+--------------------------------------------------------------------------*/
+H5RS_str_t *
+H5RS_dup_str(const char *s)
+{
+ char *new_str = NULL; /* Duplicate of string */
+ size_t path_len; /* Length of the path */
+ H5RS_str_t *ret_value;
+
+ FUNC_ENTER_NOAPI(H5RS_dup_str, FAIL)
+
+ /* Sanity check */
+ HDassert(s);
+
+ /* Get the length of the string */
+ path_len = HDstrlen(s);
+
+ /* Allocate space for the string */
+ if(NULL == (new_str = H5FL_BLK_MALLOC(str_buf, path_len + 1)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+
+ /* Copy name for full path */
+ HDstrcpy(new_str, s);
+
+ /* Create reference counted string for path */
+ ret_value = H5RS_own(new_str);
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5RS_dup_str() */
+
+
+/*--------------------------------------------------------------------------
+ NAME
H5RS_cmp
PURPOSE
Compare two ref-counted strings