[svn-r6433] Purpose:

    Code/comment cleanup

Description:
    Made more information about reference-counted strings private to the
    H5RS package by trimming the typedef used in H5RSprivate.h and switching
    from using macros for a couple of operations to using functions.

    Updated copyright information for a few of these files.

Platforms tested:
    Tested h5committest {arabica (fortran), eirene (fortran, C++)
	modi4 (parallel, fortran)}

1 files changed, 29 insertions, 22 deletions

diff --git a/src/H5RSprivate.h b/src/H5RSprivate.h
index a473af0..a154d01 100644
--- a/src/H5RSprivate.h
+++ b/src/H5RSprivate.h
@@ -1,14 +1,16 @@
-/****************************************************************************
- * NCSA HDF								    *
- * Software Development Group						    *
- * National Center for Supercomputing Applications			    *
- * University of Illinois at Urbana-Champaign				    *
- * 605 E. Springfield, Champaign IL 61820				    *
- *									    *
- * For conditions of distribution and use, see the accompanying		    *
- * hdf/COPYING file.							    *
- *									    *
- ****************************************************************************/
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
  * This file contains private information about the H5RS module
@@ -16,29 +18,32 @@
 #ifndef _H5RSprivate_H
 #define _H5RSprivate_H
 
+/**************************************/
+/* Public headers needed by this file */
+/**************************************/
 #ifdef LATER
 #include "H5RSpublic.h"
 #endif /* LATER */
 
+/***************************************/
 /* Private headers needed by this file */
+/***************************************/
 #include "H5private.h"
 
+/************/
 /* Typedefs */
+/************/
 
-/* Typedef for reference counted string */
-typedef struct {
-    char *s;            /* String to be reference counted */
-    unsigned wrapped;   /* Indicates that the string to be ref-counted is not copied */
-    unsigned n;         /* Reference count of number of pointers sharing string */
-} H5RS_str_t;
+/* Typedef for reference counted string (defined in H5RS.c) */
+typedef struct H5RS_str_t H5RS_str_t;
 
+/**********/
 /* Macros */
+/**********/
 
-/* Get the pointer to the actual string */
-#define H5RS_GET_STR(rs)        ((rs)->s)
-#define H5RS_GET_COUNT(rs)      ((rs)->n)
-
+/********************/
 /* Private routines */
+/********************/
 H5_DLL H5RS_str_t *H5RS_create(const char *s);
 H5_DLL H5RS_str_t *H5RS_wrap(const char *s);
 H5_DLL H5RS_str_t *H5RS_own(char *s);
@@ -47,6 +52,8 @@ H5_DLL herr_t H5RS_incr(H5RS_str_t *rs);
 H5_DLL H5RS_str_t *H5RS_dup(H5RS_str_t *s);
 H5_DLL int H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2);
 H5_DLL ssize_t H5RS_len(const H5RS_str_t *rs);
+H5_DLL char *H5RS_get_str(const H5RS_str_t *rs);
+H5_DLL unsigned H5RS_get_count(const H5RS_str_t *rs);
 
-#endif /* _H5STprivate_H */
+#endif /* _H5RSprivate_H */