[svn-r7444] Purpose:

    Code cleanup

Description:
    More de-linting

Platforms tested:
    FreeBSD 4.9 (sleipnir)
    Too small to need h5committest

1 files changed, 24 insertions, 22 deletions

diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index 36a806d..f4151a3 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -19,13 +19,15 @@
 
 #define H5T_PACKAGE		/*suppress error about including H5Tpkg	  */
 
-#include "H5private.h"		/*generic functions			  */
-#include "H5Eprivate.h"		/*error handling			  */
-#include "H5Iprivate.h"		/*ID functions		   		  */
-#include "H5Tpkg.h"		/*data-type functions			  */
-
+/* Pablo information */
+/* (Put before include files to avoid problems with inline functions) */
 #define PABLO_MASK	H5Toffset_mask
 
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5Iprivate.h"		/* IDs			  		*/
+#include "H5Tpkg.h"		/* Datatypes				*/
+
 /* Interface initialization */
 static int interface_initialize_g = 0;
 #define INTERFACE_INIT H5T_init_offset_interface
@@ -51,9 +53,9 @@ DESCRIPTION
 static herr_t
 H5T_init_offset_interface(void)
 {
-    FUNC_ENTER_NOINIT(H5T_init_offset_interface);
+    FUNC_ENTER_NOINIT(H5T_init_offset_interface)
 
-    FUNC_LEAVE_NOAPI(H5T_init());
+    FUNC_LEAVE_NOAPI(H5T_init())
 } /* H5T_init_offset_interface() */
 
 
@@ -97,22 +99,22 @@ H5Tget_offset(hid_t type_id)
     H5T_t	*dt = NULL;
     int	ret_value;
 
-    FUNC_ENTER_API(H5Tget_offset, -1);
+    FUNC_ENTER_API(H5Tget_offset, -1)
     H5TRACE1("Is","i",type_id);
 
     /* Check args */
     if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type");
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
     while (dt->parent)
         dt = dt->parent; /*defer to parent*/
     if (!H5T_IS_ATOMIC(dt))
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type");
+	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for specified data type")
     
     /* Offset */
     ret_value = (int)dt->u.atomic.offset;
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -161,27 +163,27 @@ H5Tset_offset(hid_t type_id, size_t offset)
     H5T_t	*dt = NULL;
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API(H5Tset_offset, FAIL);
+    FUNC_ENTER_API(H5Tset_offset, FAIL)
     H5TRACE2("e","iz",type_id,offset);
 
     /* Check args */
     if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
-	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type");
+	HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not an atomic data type")
     if (H5T_STATE_TRANSIENT!=dt->state)
-	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only");
+	HGOTO_ERROR(H5E_ARGS, H5E_CANTINIT, FAIL, "data type is read-only")
     if (H5T_STRING == dt->type && offset != 0)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type");
+	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "offset must be zero for this type")
     if (H5T_ENUM==dt->type && dt->u.enumer.nmembs>0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined");
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "operation not allowed after members are defined")
     if (H5T_COMPOUND==dt->type || H5T_REFERENCE==dt->type || H5T_OPAQUE==dt->type)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype");
+	HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "operation not defined for this datatype")
 
     /* Do the real work */
     if (H5T_set_offset(dt, offset)<0)
-	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset");
+	HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset")
 
 done:
-    FUNC_LEAVE_API(ret_value);
+    FUNC_LEAVE_API(ret_value)
 }
 
 
@@ -229,7 +231,7 @@ H5T_set_offset(H5T_t *dt, size_t offset)
 {
     herr_t      ret_value=SUCCEED;       /* Return value */
 
-    FUNC_ENTER_NOAPI(H5T_set_offset, FAIL);
+    FUNC_ENTER_NOAPI(H5T_set_offset, FAIL)
 
     /* Check args */
     assert(dt);
@@ -241,7 +243,7 @@ H5T_set_offset(H5T_t *dt, size_t offset)
 
     if (dt->parent) {
 	if (H5T_set_offset(dt->parent, offset)<0)
-	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type");
+	    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset for base type")
 
         /* Adjust size of datatype appropriately */
         if(dt->type==H5T_ARRAY)
@@ -255,6 +257,6 @@ H5T_set_offset(H5T_t *dt, size_t offset)
     }
     
 done:
-    FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value)
 }