[svn-r12320] Purpose:

    code cleanup

Description:
    Finish H5FS->H5CS internal API name changes...

Platforms tested:
    FreeBSD 4.11 (sleipnir) w/ & w/o --enable-codestack

15 files changed, 137 insertions, 133 deletions

diff --git a/MANIFEST b/MANIFEST
index 81fba07..15d1cb9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -417,6 +417,8 @@
 ./src/H5Cpkg.h
 ./src/H5Cprivate.h
 ./src/H5Cpublic.h
+./src/H5CS.c
+./src/H5CSprivate.h
 ./src/H5D.c
 ./src/H5Dcompact.c
 ./src/H5Dcontig.c
@@ -472,8 +474,6 @@
 ./src/H5FLprivate.h
 ./src/H5FO.c
 ./src/H5FOprivate.h
-./src/H5FS.c
-./src/H5FSprivate.h
 ./src/H5G.c
 ./src/H5Gent.c
 ./src/H5Glink.c
diff --git a/configure b/configure
index 4af6447..f0648dd 100755
--- a/configure
+++ b/configure
@@ -1069,7 +1069,7 @@ Optional Features:
                           specify a comma-separated list of package names
                           without the leading H5 or the word no. The default
                           is most packages.
-  --enable-funcstack      Enable the function stack tracing (for developer
+  --enable-codestack      Enable the function stack tracing (for developer
                           debugging).
   --enable-group-revision Enable the group revision code (for internal
                           developers only).
@@ -47345,25 +47345,25 @@ fi
 
 echo "$as_me:$LINENO: checking whether function stack tracking is enabled" >&5
 echo $ECHO_N "checking whether function stack tracking is enabled... $ECHO_C" >&6
-# Check whether --enable-funcstack or --disable-funcstack was given.
-if test "${enable_funcstack+set}" = set; then
-  enableval="$enable_funcstack"
-  FUNCSTACK=$enableval
+# Check whether --enable-codestack or --disable-codestack was given.
+if test "${enable_codestack+set}" = set; then
+  enableval="$enable_codestack"
+  CODESTACK=$enableval
 fi;
 
-case "X-$FUNCSTACK" in
+case "X-$CODESTACK" in
   X-yes)
-      FUNCSTACK=yes
+      CODESTACK=yes
       echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_FUNCSTACK 1
+#define HAVE_CODESTACK 1
 _ACEOF
 
     ;;
   *)
-      FUNCSTACK=no
+      CODESTACK=no
       echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
     ;;
@@ -53071,7 +53071,7 @@ PRINT_N "                        dmalloc"
 IF_YES_NO "$HAVE_DMALLOC"
 
 PRINT_N "         Function Stack Tracing"
-IF_ENABLED_DISABLED "$FUNCSTACK"
+IF_ENABLED_DISABLED "$CODESTACK"
 
 PRINT_N "                 Group Revision"
 IF_ENABLED_DISABLED "$GROUPREVISION"
diff --git a/configure.in b/configure.in
index d0086ec..25baa47 100644
--- a/configure.in
+++ b/configure.in
@@ -1783,20 +1783,20 @@ dnl ----------------------------------------------------------------------
 dnl Check if they would like the function stack support compiled in
 dnl
 AC_MSG_CHECKING([whether function stack tracking is enabled])
-AC_ARG_ENABLE([funcstack],
-              [AC_HELP_STRING([--enable-funcstack],
+AC_ARG_ENABLE([codestack],
+              [AC_HELP_STRING([--enable-codestack],
                               [Enable the function stack tracing (for developer debugging).])],
-              [FUNCSTACK=$enableval])
+              [CODESTACK=$enableval])
 
-case "X-$FUNCSTACK" in
+case "X-$CODESTACK" in
   X-yes)
-      FUNCSTACK=yes
+      CODESTACK=yes
       AC_MSG_RESULT([yes])
-      AC_DEFINE([HAVE_FUNCSTACK], [1],
+      AC_DEFINE([HAVE_CODESTACK], [1],
                 [Define if the function stack tracing code is to be compiled in])
     ;;
   *)
-      FUNCSTACK=no
+      CODESTACK=no
       AC_MSG_RESULT([no])
     ;;
 esac
@@ -3514,7 +3514,7 @@ PRINT_N "                        dmalloc"
 IF_YES_NO "$HAVE_DMALLOC"
 
 PRINT_N "         Function Stack Tracing"
-IF_ENABLED_DISABLED "$FUNCSTACK"
+IF_ENABLED_DISABLED "$CODESTACK"
 
 PRINT_N "                 Group Revision"
 IF_ENABLED_DISABLED "$GROUPREVISION"
diff --git a/src/H5CS.c b/src/H5CS.c
index ed7f8b6..3de842b 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -28,10 +28,10 @@
 
 
 #include "H5private.h"		/* Generic Functions			*/
-#include "H5FSprivate.h"	/* Function stack			*/
+#include "H5CSprivate.h"	/* Function stack			*/
 #include "H5MMprivate.h"	/* Memory management			*/
 
-#ifdef H5_HAVE_FUNCSTACK
+#ifdef H5_HAVE_CODESTACK
 
 #ifdef H5_HAVE_THREADSAFE
 /*
@@ -40,29 +40,29 @@
  * each thread individually. The association of stacks to threads will
  * be handled by the pthread library.
  *
- * In order for this macro to work, H5FS_get_my_stack() must be preceeded
- * by "H5FS_t *fstack =".
+ * In order for this macro to work, H5CS_get_my_stack() must be preceeded
+ * by "H5CS_t *fstack =".
  */
-static H5FS_t *H5FS_get_stack(void);
-#define H5FS_get_my_stack()  H5FS_get_stack()
+static H5CS_t *H5CS_get_stack(void);
+#define H5CS_get_my_stack()  H5CS_get_stack()
 #else /* H5_HAVE_THREADSAFE */
 /*
  * The function stack.  Eventually we'll have some sort of global table so each
  * thread has it's own stack.  The stacks will be created on demand when the
- * thread first calls H5FS_push().  */
-H5FS_t		H5FS_stack_g[1];
-#define H5FS_get_my_stack()	(H5FS_stack_g+0)
+ * thread first calls H5CS_push().  */
+H5CS_t		H5CS_stack_g[1];
+#define H5CS_get_my_stack()	(H5CS_stack_g+0)
 #endif /* H5_HAVE_THREADSAFE */
 
 
 #ifdef H5_HAVE_THREADSAFE
 /*-------------------------------------------------------------------------
- * Function:	H5FS_get_stack
+ * Function:	H5CS_get_stack
  *
- * Purpose:	Support function for H5FS_get_my_stack() to initialize and
+ * Purpose:	Support function for H5CS_get_my_stack() to initialize and
  *              acquire per-thread function stack.
  *
- * Return:	Success:	function stack (H5FS_t *)
+ * Return:	Success:	function stack (H5CS_t *)
  *
  *		Failure:	NULL
  *
@@ -73,17 +73,17 @@ H5FS_t		H5FS_stack_g[1];
  *
  *-------------------------------------------------------------------------
  */
-static H5FS_t *
-H5FS_get_stack(void)
+static H5CS_t *
+H5CS_get_stack(void)
 {
-    H5FS_t *fstack;
+    H5CS_t *fstack;
 
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_get_stack);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_get_stack);
 
     fstack = pthread_getspecific(H5TS_funcstk_key_g);
     if (!fstack) {
         /* no associated value with current thread - create one */
-        fstack = (H5FS_t *)HDmalloc(sizeof(H5FS_t));  /* Don't use H5MM_malloc() here, it causes infinite recursion */
+        fstack = (H5CS_t *)HDmalloc(sizeof(H5CS_t));  /* Don't use H5MM_malloc() here, it causes infinite recursion */
         HDassert(fstack);
 
         /* Set the thread-specific info */
@@ -97,12 +97,12 @@ H5FS_get_stack(void)
     }
 
     FUNC_LEAVE_NOAPI_NOFS(fstack);
-} /* end H5FS_get_stack() */
+} /* end H5CS_get_stack() */
 #endif  /* H5_HAVE_THREADSAFE */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_print_stack
+ * Function:	H5CS_print_stack
  *
  * Purpose:	Prints a function stack.
  *
@@ -116,13 +116,13 @@ H5FS_get_stack(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_print_stack(const H5FS_t *fstack, FILE *stream)
+H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
 {
     const int	indent = 2;             /* Indention level */
     int         i;                      /* Local index ariable */
 
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_print_stack);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print_stack);
 
     /* Sanity check */
     HDassert(fstack);
@@ -146,11 +146,11 @@ H5FS_print_stack(const H5FS_t *fstack, FILE *stream)
         HDfprintf(stream, "%*s#%03d: Routine: %s\n", indent, "", i, fstack->slot[i]);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_print_stack() */
+} /* end H5CS_print_stack() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_print
+ * Function:	H5CS_print
  *
  * Purpose:	Prints the default function stack in some default way.
  *
@@ -164,24 +164,24 @@ H5FS_print_stack(const H5FS_t *fstack, FILE *stream)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_print(FILE *stream)
+H5CS_print(FILE *stream)
 {
-    H5FS_t	*fstack = H5FS_get_my_stack (); /* Get the correct function stack */
+    H5CS_t	*fstack = H5CS_get_my_stack (); /* Get the correct function stack */
     
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_print);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print);
     
     /* Sanity check */
     assert(fstack);
 
-    H5FS_print_stack(fstack, stream);
+    H5CS_print_stack(fstack, stream);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_print() */
+} /* end H5CS_print() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_push
+ * Function:	H5CS_push
  *
  * Purpose:	Pushes a new record onto function stack for the current
  *		thread.
@@ -196,12 +196,12 @@ H5FS_print(FILE *stream)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_push(const char *func_name)
+H5CS_push(const char *func_name)
 {
-    H5FS_t	*fstack = H5FS_get_my_stack ();
+    H5CS_t	*fstack = H5CS_get_my_stack ();
 
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_push);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_push);
 
     /* Sanity check */
     assert (fstack);
@@ -210,16 +210,16 @@ H5FS_push(const char *func_name)
     /*
      * Push the function if there's room.  Otherwise just increment count
      */
-    if (fstack->nused<H5FS_NSLOTS)
+    if (fstack->nused<H5CS_NSLOTS)
 	fstack->slot[fstack->nused] = func_name;
     fstack->nused++;
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_push() */
+} /* end H5CS_push() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_pop
+ * Function:	H5CS_pop
  *
  * Purpose:	Pops a record off function stack for the current thread.
  *
@@ -233,12 +233,12 @@ H5FS_push(const char *func_name)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_pop(void)
+H5CS_pop(void)
 {
-    H5FS_t	*fstack = H5FS_get_my_stack ();
+    H5CS_t	*fstack = H5CS_get_my_stack ();
 
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_pop);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_pop);
 
     /* Sanity check */
     assert (fstack);
@@ -248,11 +248,11 @@ H5FS_pop(void)
     fstack->nused--;
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_pop() */
+} /* end H5CS_pop() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_copy_stack
+ * Function:	H5CS_copy_stack
  *
  * Purpose:	Makes a copy of the current stack
  *
@@ -266,13 +266,13 @@ H5FS_pop(void)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_copy_stack(H5FS_t *new_stack)
+H5CS_copy_stack(H5CS_t *new_stack)
 {
-    H5FS_t	*old_stack = H5FS_get_my_stack ();
+    H5CS_t	*old_stack = H5CS_get_my_stack ();
     unsigned    u;                      /* Local index variable */
     
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_copy_stack);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_copy_stack);
 
     /* Sanity check */
     HDassert (old_stack);
@@ -283,11 +283,11 @@ H5FS_copy_stack(H5FS_t *new_stack)
     new_stack->nused = old_stack->nused;
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_copy_stack() */
+} /* end H5CS_copy_stack() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_close_stack
+ * Function:	H5CS_close_stack
  *
  * Purpose:	Closes a copy of a stack
  *
@@ -301,12 +301,12 @@ H5FS_copy_stack(H5FS_t *new_stack)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_close_stack(H5FS_t *stack)
+H5CS_close_stack(H5CS_t *stack)
 {
     unsigned    u;                      /* Local index variable */
     
     /* Don't push this function on the function stack... :-) */
-    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5FS_close_stack);
+    FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_close_stack);
 
     /* Sanity check */
     HDassert (stack);
@@ -316,6 +316,7 @@ H5FS_close_stack(H5FS_t *stack)
         stack->slot[u] = H5MM_xfree((void *)stack->slot[u]);
 
     FUNC_LEAVE_NOAPI_NOFS(SUCCEED);
-} /* end H5FS_close_stack() */
+} /* end H5CS_close_stack() */
+
+#endif /* H5_HAVE_CODESTACK */
 
-#endif /* H5_HAVE_FUNCSTACK */
diff --git a/src/H5CSprivate.h b/src/H5CSprivate.h
index d75bbec..9af07d5 100644
--- a/src/H5CSprivate.h
+++ b/src/H5CSprivate.h
@@ -15,29 +15,29 @@
 /*
  *  Header file for function stacks, etc.
  */
-#ifndef _H5FSprivate_H
-#define _H5FSprivate_H
+#ifndef _H5CSprivate_H
+#define _H5CSprivate_H
 
 #ifdef NOT_YET
-#include "H5FSpublic.h"
+#include "H5CSpublic.h"
 #endif /* NOT_YET */
 
 /* Private headers needed by this file */
 #include "H5private.h"
 
-#define H5FS_NSLOTS	32	/*number of slots in an function stack	     */
+#define H5CS_NSLOTS	32	/*number of slots in an function stack	     */
 
 /* A function stack */
-typedef struct H5FS_t {
+typedef struct H5CS_t {
     unsigned	nused;			        /*num slots currently used in stack  */
-    const char *slot[H5FS_NSLOTS];	/*array of function records	     */
-} H5FS_t;
+    const char *slot[H5CS_NSLOTS];	/*array of function records	     */
+} H5CS_t;
 
-H5_DLL herr_t H5FS_push (const char *func_name);
-H5_DLL herr_t H5FS_pop (void);
-H5_DLL herr_t H5FS_print (FILE *stream);
-H5_DLL herr_t H5FS_print_stack (const H5FS_t *stack, FILE *stream);
-H5_DLL herr_t H5FS_copy_stack (H5FS_t *stack);
-H5_DLL herr_t H5FS_close_stack (H5FS_t *stack);
+H5_DLL herr_t H5CS_push (const char *func_name);
+H5_DLL herr_t H5CS_pop (void);
+H5_DLL herr_t H5CS_print (FILE *stream);
+H5_DLL herr_t H5CS_print_stack (const H5CS_t *stack, FILE *stream);
+H5_DLL herr_t H5CS_copy_stack (H5CS_t *stack);
+H5_DLL herr_t H5CS_close_stack (H5CS_t *stack);
 
-#endif /* _H5FSprivate_H */
+#endif /* _H5CSprivate_H */
diff --git a/src/H5FL.c b/src/H5FL.c
index 1165a36..e75078f 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -265,7 +265,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
         H5FL_track_t *trk = obj = ((unsigned char *)obj) - sizeof(H5FL_track_t);
 
         /* Free tracking information about the allocation location */
-        H5FS_close_stack(trk->stack);
+        H5CS_close_stack(trk->stack);
         trk->stack = H5MM_xfree(trk->stack);
         trk->file = H5MM_xfree(trk->file);
         trk->func = H5MM_xfree(trk->func);
@@ -376,8 +376,8 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
 
 #ifdef H5FL_TRACK
     /* Copy allocation location information */
-    ((H5FL_track_t *)ret_value)->stack = H5MM_malloc(sizeof(H5FS_t));
-    H5FS_copy_stack(((H5FL_track_t *)ret_value)->stack);
+    ((H5FL_track_t *)ret_value)->stack = H5MM_malloc(sizeof(H5CS_t));
+    H5CS_copy_stack(((H5FL_track_t *)ret_value)->stack);
     ((H5FL_track_t *)ret_value)->file = H5MM_strdup(call_file);
     ((H5FL_track_t *)ret_value)->func = H5MM_strdup(call_func);
     ((H5FL_track_t *)ret_value)->line = call_line;
@@ -874,8 +874,8 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
 
 #ifdef H5FL_TRACK
     /* Copy allocation location information */
-    ((H5FL_track_t *)ret_value)->stack = H5MM_malloc(sizeof(H5FS_t));
-    H5FS_copy_stack(((H5FL_track_t *)ret_value)->stack);
+    ((H5FL_track_t *)ret_value)->stack = H5MM_malloc(sizeof(H5CS_t));
+    H5CS_copy_stack(((H5FL_track_t *)ret_value)->stack);
     ((H5FL_track_t *)ret_value)->file = H5MM_strdup(call_file);
     ((H5FL_track_t *)ret_value)->func = H5MM_strdup(call_func);
     ((H5FL_track_t *)ret_value)->line = call_line;
@@ -975,7 +975,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block)
         H5FL_track_t *trk = block = ((unsigned char *)block) - sizeof(H5FL_track_t);
 
         /* Free tracking information about the allocation location */
-        H5FS_close_stack(trk->stack);
+        H5CS_close_stack(trk->stack);
         trk->stack = H5MM_xfree(trk->stack);
         trk->file = H5MM_xfree(trk->file);
         trk->func = H5MM_xfree(trk->func);
@@ -1091,12 +1091,12 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_
                 H5FL_track_t *trk = (H5FL_track_t *)(((unsigned char *)block) - sizeof(H5FL_track_t));
 
                 /* Release previous tracking information */
-                H5FS_close_stack(trk->stack);
+                H5CS_close_stack(trk->stack);
                 trk->file = H5MM_xfree(trk->file);
                 trk->func = H5MM_xfree(trk->func);
 
                 /* Store new tracking information */
-                H5FS_copy_stack(trk->stack);
+                H5CS_copy_stack(trk->stack);
                 trk->file = H5MM_strdup(call_file);
                 trk->func = H5MM_strdup(call_func);
                 trk->line = call_line;
@@ -2271,7 +2271,7 @@ H5FL_term_interface(void)
             /* Print information about the outstanding block */
             HDfprintf(stderr,"%s: Outstanding allocation:\n", "H5FL_term_interface");
             HDfprintf(stderr,"\tFile: %s, Function: %s, Line: %d\n", trk->file, trk->func, trk->line);
-            H5FS_print_stack(trk->stack, stderr);
+            H5CS_print_stack(trk->stack, stderr);
 
             /* Advance to next node */
             trk = trk->next;
diff --git a/src/H5FLprivate.h b/src/H5FLprivate.h
index 2ff31c7..1e0e3b6 100644
--- a/src/H5FLprivate.h
+++ b/src/H5FLprivate.h
@@ -64,7 +64,7 @@
 
 /* Tracking information for each block */
 typedef struct H5FL_track_t {
-    H5FS_t *stack;      /* Function stack */
+    H5CS_t *stack;      /* Function stack */
     char *file;         /* Name of file containing calling function */
     char *func;         /* Name of calling function */
     int line;           /* Line # within calling function */
diff --git a/src/H5TS.c b/src/H5TS.c
index 184c0bd..9597d4f 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -64,7 +64,7 @@ static void H5TS_mutex_init(H5TS_mutex_t *mutex);
 static void
 H5TS_key_destructor(void *key_val)
 {
-    /* Use HDfree here instead of H5MM_xfree(), to avoid calling the H5FS routines */
+    /* Use HDfree here instead of H5MM_xfree(), to avoid calling the H5CS routines */
     if(key_val!=NULL)
         HDfree(key_val);
 }
diff --git a/src/H5config.h.in b/src/H5config.h.in
index d8bc362..0f8d607 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -48,6 +48,9 @@
 /* Define to 1 if you have the `BSDgettimeofday' function. */
 #undef HAVE_BSDGETTIMEOFDAY
 
+/* Define if the function stack tracing code is to be compiled in */
+#undef HAVE_CODESTACK
+
 /* Define to 1 if you have the `difftime' function. */
 #undef HAVE_DIFFTIME
 
@@ -90,9 +93,6 @@
 /* Define to 1 if you have the `fseek64' function. */
 #undef HAVE_FSEEK64
 
-/* Define if the function stack tracing code is to be compiled in */
-#undef HAVE_FUNCSTACK
-
 /* Define if the compiler understand the __FUNCTION__ keyword */
 #undef HAVE_FUNCTION
 
diff --git a/src/H5private.h b/src/H5private.h
index 98793a8..df96165 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1161,17 +1161,17 @@ extern hbool_t H5_libinit_g;    /* Has the library been initialized? */
 
 #endif /* H5_HAVE_THREADSAFE */
 
-#ifdef H5_HAVE_FUNCSTACK
+#ifdef H5_HAVE_CODESTACK
 
 /* Include required function stack header */
-#include "H5FSprivate.h"
+#include "H5CSprivate.h"
 
-#define H5_PUSH_FUNC(func_name) H5FS_push(#func_name)
-#define H5_POP_FUNC             H5FS_pop()
-#else /* H5_HAVE_FUNCSTACK */
+#define H5_PUSH_FUNC(func_name) H5CS_push(#func_name)
+#define H5_POP_FUNC             H5CS_pop()
+#else /* H5_HAVE_CODESTACK */
 #define H5_PUSH_FUNC(func_name) /* void */
 #define H5_POP_FUNC             /* void */
-#endif /* H5_HAVE_FUNCSTACK */
+#endif /* H5_HAVE_CODESTACK */
 
 #ifdef H5_HAVE_MPE
 extern hbool_t H5_MPEinit_g;   /* Has the MPE Library been initialized? */
@@ -1340,7 +1340,7 @@ static herr_t		H5_INTERFACE_INIT_FUNC(void);
 /*
  * Use this macro for non-API functions which fall into these categories:
  *      - functions which shouldn't push their name on the function stack
- *              (so far, just the H5FS routines themselves)
+ *              (so far, just the H5CS routines themselves)
  *
  * This macro is used for functions which fit the above categories _and_
  * also don't use the 'FUNC' variable (i.e. don't push errors on the error stack)
@@ -1422,7 +1422,7 @@ static herr_t		H5_INTERFACE_INIT_FUNC(void);
 /*
  * Use this macro for non-API functions which fall into these categories:
  *      - functions which didn't push their name on the function stack
- *              (so far, just the H5FS routines themselves)
+ *              (so far, just the H5CS routines themselves)
  */
 #define FUNC_LEAVE_NOAPI_NOFS(ret_value)                                      \
         return (ret_value);						      \
diff --git a/src/Makefile.am b/src/Makefile.am
index bcba38a..0d01ec2 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -41,6 +41,7 @@ MOSTLYCLEANFILES=H5Tinit.c
 libhdf5_la_SOURCES= H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
         H5C.c \
+        H5CS.c \
         H5D.c \
         H5Dcompact.c \
         H5Dcontig.c \
@@ -49,7 +50,7 @@ libhdf5_la_SOURCES= H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5Fdbg.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5FD.c H5FDcore.c  \
         H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
         H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
-        H5FDstream.c H5FL.c H5FO.c H5FS.c    \
+        H5FDstream.c H5FL.c H5FO.c \
         H5G.c H5Gent.c H5Glink.c H5Gloc.c H5Gname.c H5Gnode.c H5Gobj.c \
         H5Goh.c  \
         H5Gstab.c  \
diff --git a/src/Makefile.in b/src/Makefile.in
index 96c3f56..858fd9c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -84,32 +84,33 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
 libhdf5_la_LIBADD =
 am_libhdf5_la_OBJECTS = H5.lo H5dbg.lo H5A.lo H5AC.lo H5B.lo \
 	H5Bcache.lo H5B2.lo H5B2cache.lo H5B2dbg.lo H5B2int.lo \
-	H5B2stat.lo H5B2test.lo H5C.lo H5D.lo H5Dcompact.lo \
+	H5B2stat.lo H5B2test.lo H5C.lo H5CS.lo H5D.lo H5Dcompact.lo \
 	H5Dcontig.lo H5Defl.lo H5Dio.lo H5Distore.lo H5Dmpio.lo \
 	H5Doh.lo H5Dselect.lo H5Dtest.lo H5E.lo H5F.lo H5Fdbg.lo \
 	H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5FD.lo H5FDcore.lo \
 	H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \
 	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDstdio.lo \
-	H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo H5G.lo H5Gent.lo \
-	H5Glink.lo H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo \
-	H5Gstab.lo H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFcache.lo \
-	H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFflist.lo H5HFhdr.lo \
-	H5HFiblock.lo H5HFint.lo H5HFiter.lo H5HFstat.lo H5HFtest.lo H5HG.lo \
-	H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5MF.lo H5MM.lo \
-	H5MP.lo H5MPtest.lo H5O.lo H5Oattr.lo H5Obogus.lo H5Ocache.lo \
-	H5Ocont.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo H5Oginfo.lo \
-	H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omtime.lo H5Oname.lo \
-	H5Onull.lo H5Opline.lo H5Osdspace.lo H5Oshared.lo H5Ostab.lo \
-	H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo H5Pfcpl.lo \
-	H5Pgcpl.lo H5Pocpl.lo H5Ptest.lo H5R.lo H5RC.lo H5RS.lo H5S.lo \
-	H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo H5Spoint.lo \
-	H5Sselect.lo H5Stest.lo H5SL.lo H5ST.lo H5T.lo H5Tarray.lo \
-	H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo \
-	H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo \
-	H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo \
-	H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo H5TS.lo H5V.lo \
-	H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
-	H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
+	H5FDstream.lo H5FL.lo H5FO.lo H5G.lo H5Gent.lo H5Glink.lo \
+	H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo \
+	H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFcache.lo H5HFdbg.lo \
+	H5HFdblock.lo H5HFdtable.lo H5HFflist.lo H5HFhdr.lo \
+	H5HFiblock.lo H5HFint.lo H5HFiter.lo H5HFstat.lo H5HFtest.lo \
+	H5HG.lo H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5MF.lo \
+	H5MM.lo H5MP.lo H5MPtest.lo H5O.lo H5Oattr.lo H5Obogus.lo \
+	H5Ocache.lo H5Ocont.lo H5Odtype.lo H5Oefl.lo H5Ofill.lo \
+	H5Oginfo.lo H5Olayout.lo H5Olinfo.lo H5Olink.lo H5Omtime.lo \
+	H5Oname.lo H5Onull.lo H5Opline.lo H5Osdspace.lo H5Oshared.lo \
+	H5Ostab.lo H5P.lo H5Pacpl.lo H5Pdcpl.lo H5Pdxpl.lo H5Pfapl.lo \
+	H5Pfcpl.lo H5Pgcpl.lo H5Pocpl.lo H5Ptest.lo H5R.lo H5RC.lo \
+	H5RS.lo H5S.lo H5Sall.lo H5Shyper.lo H5Smpio.lo H5Snone.lo \
+	H5Spoint.lo H5Sselect.lo H5Stest.lo H5SL.lo H5ST.lo H5T.lo \
+	H5Tarray.lo H5Tbit.lo H5Tcommit.lo H5Tcompound.lo H5Tconv.lo \
+	H5Tcset.lo H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo \
+	H5Tinit.lo H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo \
+	H5Torder.lo H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo \
+	H5TS.lo H5V.lo H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo \
+	H5Znbit.lo H5Zshuffle.lo H5Zszip.lo H5Zscaleoffset.lo \
+	H5Ztrans.lo
 libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
 H5detect_SOURCES = H5detect.c
@@ -396,6 +397,7 @@ MOSTLYCLEANFILES = H5Tinit.c
 libhdf5_la_SOURCES = H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5B2.c H5B2cache.c H5B2dbg.c H5B2int.c H5B2stat.c H5B2test.c \
         H5C.c \
+        H5CS.c \
         H5D.c \
         H5Dcompact.c \
         H5Dcontig.c \
@@ -404,7 +406,7 @@ libhdf5_la_SOURCES = H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5Fdbg.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5FD.c H5FDcore.c  \
         H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
         H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
-        H5FDstream.c H5FL.c H5FO.c H5FS.c    \
+        H5FDstream.c H5FL.c H5FO.c \
         H5G.c H5Gent.c H5Glink.c H5Gloc.c H5Gname.c H5Gnode.c H5Gobj.c \
         H5Goh.c  \
         H5Gstab.c  \
@@ -576,6 +578,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5B2test.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Bcache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5C.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5CS.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5D.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcompact.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Dcontig.Plo@am__quote@
@@ -601,7 +604,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FDstream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FL.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FO.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FS.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fdbg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmount.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsfile.Plo@am__quote@
diff --git a/src/hdf5.lnt b/src/hdf5.lnt
index 95b7d72..1d02039 100755
--- a/src/hdf5.lnt
+++ b/src/hdf5.lnt
@@ -30,7 +30,7 @@
 -esym(534, HDfprintf, HDsnprintf, HDvsnprintf)
 -esym(534, H5E_clear_stack, H5E_push_stack)
 -esym(534, H5FL_arr_free, H5FL_blk_free, H5FL_reg_free, H5FL_seq_free)
--esym(534, H5FS_push, H5FS_pop)
+-esym(534, H5CS_push, H5CS_pop)
 -esym(534, H5I_clear_type, H5I_dec_type_ref)
 -esym(534, H5MM_xfree)
 -esym(534, H5RC_decr)
diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h
index 0fb33c1..a026192 100644
--- a/vms/src/h5pubconf.h
+++ b/vms/src/h5pubconf.h
@@ -100,7 +100,7 @@
 /* #undef H5_HAVE_FSEEK64 */
 
 /* Define if the function stack tracing code is to be compiled in */
-/*#define H5_HAVE_FUNCSTACK 1*/
+/*#define H5_HAVE_CODESTACK 1*/
 
 /* Define if the compiler understand the __FUNCTION__ keyword */
 /* EIP #define H5_HAVE_FUNCTION 1*/
diff --git a/vms/src/make.com b/vms/src/make.com
index 2288638..e7d5106 100644
--- a/vms/src/make.com
+++ b/vms/src/make.com
@@ -28,13 +28,13 @@ $ type sys$input
          Creating  HDF5 library
 $!
 $ cobj= "H5, H5A, H5AC, H5B, H5B2, H5B2cache,"+-
-        "H5Bcache, H5B2dbg, H5B2test, H5B2int, H5B2stat, H5C,"+-  
+        "H5Bcache, H5B2dbg, H5B2test, H5B2int, H5B2stat, H5C, H5CS,"+-  
         "H5D, H5Dcontig, H5Dcompact,"+-
         "H5Defl, H5Dio, H5Distore, H5Doh, H5Dmpio, H5Dselect, H5Dtest ,"+-
         "H5E, H5F, H5Fdbg, H5Fmount, H5Fsfile, H5Fsuper, H5FD, H5FDcore,"+-
         "H5FDfamily, H5FDlog, H5FDmpi, H5FDmpio,"+-
         "H5FDmpiposix, H5FDmulti, H5FDsec2, H5FDstdio,"+-
-        "H5FDstream, H5FL, H5FO, H5FS,"+-
+        "H5FDstream, H5FL, H5FO,"+-
         "H5G, H5Gent, H5Glink, H5Gloc, H5Gname, H5Gnode, H5Gstab,"+-
         "H5Gobj, H5Goh, H5Gtest, H5Gtraverse,"+-
         "H5HF, H5HFcache, H5HFdbg, H5HFint, H5HFtest, H5HFflist, H5HFstat,"+-