[svn-r14003] Description:

	Code cleanup & whitespace fixups

Tested on:
	FreeBSD/32 6.2 (duty)
	FreeBSD/64 6.2 (liberty)
	Linux/32 2.6 (kagiso)
	Mac OS X/32 10.4.10 (amazon)

3 files changed, 15 insertions, 8 deletions

diff --git a/src/H5SM.c b/src/H5SM.c
index 1e3ced3..bf0a5d8 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1255,6 +1255,7 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
         if(share_in_ohdr && open_oh) {
             /* Set up shared component info */
             shared.type = H5O_SHARE_TYPE_HERE;
+
             /* Retrieve any creation index from the native message */
             if(H5O_msg_get_crt_index(type_id, mesg, &shared.u.loc.index) < 0)
                 HGOTO_ERROR(H5E_SOHM, H5E_CANTGET, FAIL, "unable to retrieve creation index")
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index e0d878a..075cce8 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -1884,26 +1884,24 @@ done:
  * Programmer:	Raymond Lu
  *		8 June 2007
  *
- * Modifications:
  *-------------------------------------------------------------------------
  */
 H5T_subset_t
 H5T_conv_struct_subset(const H5T_cdata_t *cdata)
 {
     H5T_conv_struct_t	*priv;
-    H5T_subset_t        ret_value=FALSE;       /* Return value */
+    H5T_subset_t        ret_value = FALSE;       /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5T_conv_struct_subset);
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_conv_struct_subset)
 
-    assert(cdata);
-    assert(cdata->priv);
+    HDassert(cdata);
+    HDassert(cdata->priv);
 
     priv = (H5T_conv_struct_t*)(cdata->priv);
     ret_value = priv->smembs_subset;
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value);
-}
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5T_conv_struct_subset() */
 
 
 /*-------------------------------------------------------------------------
diff --git a/test/objcopy.c b/test/objcopy.c
index df4c912..105de75 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -31,6 +31,14 @@
 #define H5S_TESTING
 #include "H5Spkg.h"		/* Dataspaces 				*/
 
+/*
+ * This file needs to access private information from the H5P package.
+ * This file also needs to access the property list testing code.
+ */
+#define H5P_PACKAGE
+#define H5P_TESTING
+#include "H5Ppkg.h"		/* Property Lists 			*/
+
 #include "H5Dprivate.h"         /* Datasets (for EFL property name)     */