[svn-r6430] Purpose:

    Code cleanup (sorta)

Description:
    Updated to new copyright information as I browsed these files.

7 files changed, 103 insertions, 50 deletions

diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 96cf05c..be37ae1 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -1,8 +1,18 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /*-------------------------------------------------------------------------
- * Copyright (C) 1997-2001 National Center for Supercomputing Applications
- *			   All rights reserved
- *
- *-------------------------------------------------------------------------
  *
  * Created:		H5ACprivate.h
  *			Jul  9 1997
@@ -15,6 +25,7 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #ifndef _H5ACprivate_H
 #define _H5ACprivate_H
 
diff --git a/src/H5Bprivate.h b/src/H5Bprivate.h
index 5c8ef1a..28e3060 100644
--- a/src/H5Bprivate.h
+++ b/src/H5Bprivate.h
@@ -1,8 +1,18 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /*-------------------------------------------------------------------------
- * Copyright (C) 1997-2001 National Center for Supercomputing Applications
- *			   All rights reserved.
- *
- *-------------------------------------------------------------------------
  *
  * Created:		H5Bprivate.h
  *			Jul 10 1997
@@ -14,6 +24,7 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #ifndef _H5Bprivate_H
 #define _H5Bprivate_H
 
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 10127dc..87dfc68 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -1,8 +1,18 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 /*-------------------------------------------------------------------------
- * Copyright (C) 1997-2001 National Center for Supercomputing Applications
- *                         All rights reserved.
- *
- *-------------------------------------------------------------------------
  *
  * Created:             H5Gprivate.h
  *                      Jul 11 1997
@@ -17,6 +27,7 @@
  *
  *-------------------------------------------------------------------------
  */
+
 #ifndef _H5Gprivate_H
 #define _H5Gprivate_H
 
@@ -96,13 +107,8 @@ typedef struct H5G_entry_t {
     H5G_type_t  type;                   /*type of information cached         */
     H5G_cache_t cache;                  /*cached data from object header     */
     H5F_t       *file;                  /*file to which this obj hdr belongs */
-#ifdef OLD_WAY
-    char        *user_path;             /* Path to object, as opened by user */
-    char        *canon_path;            /* Path to object, as found in file  */
-#else /* OLD_WAY */
     H5RS_str_t  *user_path_r;           /* Path to object, as opened by user */
     H5RS_str_t  *canon_path_r;          /* Path to object, as found in file  */
-#endif /* OLD_WAY */
     unsigned    user_path_hidden;       /* Whether the user's path is valid  */
 } H5G_entry_t;
 
diff --git a/src/H5ST.c b/src/H5ST.c
index 35af906..0fc55a6 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* TERNARY SEARCH TREE ALGS
   This code is described in "Ternary Search Trees" by Jon
diff --git a/src/H5STprivate.h b/src/H5STprivate.h
index 60452a6..0d4561c 100644
--- a/src/H5STprivate.h
+++ b/src/H5STprivate.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 H5ST module
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 8d808c5..5d921d8 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -1,11 +1,21 @@
-/*
- * Copyright (C) 1998-2001 NCSA
- *                         All rights reserved.
- *
- * Programmer:  Quincey Koziol <koziol@ncsa.uiuc.ued>
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Programmer:  Quincey Koziol <koziol@ncsa.uiuc.ued>
  *              Friday, May 29, 1998
  *
- * Purpose:	Dataspace functions.
+ * Purpose:	Dataspace selection functions.
  */
 
 #define H5S_PACKAGE		/*suppress error about including H5Spkg	  */
diff --git a/src/H5private.h b/src/H5private.h
index 09e0f02..ec08f0f 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1,8 +1,18 @@
-/*
- * Copyright (C) 1998-2002 NCSA
- *		           All rights reserved.
- *
- * Programmer:	Robb Matzke <matzke@llnl.gov>
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * 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. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/* Programmer:	Robb Matzke <matzke@llnl.gov>
  *		Friday, October 30, 1998
  *
  * Purpose:	This file is included by all HDF5 library source files to
@@ -11,6 +21,7 @@
  *		defined in H5config.h which is included by H5public.h.
  *
  */
+
 #ifndef _H5private_H
 #define _H5private_H