From a2f274ec459ce1282380cdf63f58b4e4c03c1751 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Sat, 22 Jan 2005 08:59:28 -0500 Subject: [svn-r9859] Purpose: Code cleanup Description: Clean up a few rements from the Pablo removal Platforms tested: None, very minor --- src/H5.c | 3 --- src/H5AC.c | 3 --- src/H5B.c | 3 --- src/H5C.c | 3 --- src/H5D.c | 3 --- src/H5Dcompact.c | 3 --- src/H5Dcontig.c | 3 --- src/H5Defl.c | 3 --- src/H5Dio.c | 3 --- src/H5private.h | 4 +--- src/hdf5.lnt | 2 +- 11 files changed, 2 insertions(+), 31 deletions(-) diff --git a/src/H5.c b/src/H5.c index 5e50582..de41d2c 100644 --- a/src/H5.c +++ b/src/H5.c @@ -14,9 +14,6 @@ #define H5I_PACKAGE /*suppress error about including H5Ipkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Bprivate.h" /* B-link trees */ #include "H5Dprivate.h" /* Datasets */ diff --git a/src/H5AC.c b/src/H5AC.c index 51f7c30..7415385 100644 --- a/src/H5AC.c +++ b/src/H5AC.c @@ -47,9 +47,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5AC_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ #include "H5Dprivate.h" /* Dataset functions */ diff --git a/src/H5B.c b/src/H5B.c index f0a62b4..9e36002 100644 --- a/src/H5B.c +++ b/src/H5B.c @@ -100,9 +100,6 @@ #define H5B_PACKAGE /*suppress error about including H5Bpkg */ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - /* private headers */ #include "H5private.h" /* Generic Functions */ #include "H5ACprivate.h" /* Metadata cache */ diff --git a/src/H5C.c b/src/H5C.c index 7da196c..fbac5fa 100644 --- a/src/H5C.c +++ b/src/H5C.c @@ -83,9 +83,6 @@ #define H5F_PACKAGE /*suppress error about including H5Fpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Cprivate.h" /* Cache */ #include "H5Dprivate.h" /* Dataset functions */ diff --git a/src/H5D.c b/src/H5D.c index eea8263..e2abb44 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -17,9 +17,6 @@ /* Interface initialization */ #define H5_INTERFACE_INIT_FUNC H5D_init_interface -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c index 3ce7caf..a3048b3 100644 --- a/src/H5Dcompact.c +++ b/src/H5Dcompact.c @@ -22,9 +22,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index 7c8b553..d03c597 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -24,9 +24,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Defl.c b/src/H5Defl.c index adf5124..4e1c601 100644 --- a/src/H5Defl.c +++ b/src/H5Defl.c @@ -19,9 +19,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Datasets */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5Dio.c b/src/H5Dio.c index 6616483..2c60a17 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -14,9 +14,6 @@ #define H5D_PACKAGE /*suppress error about including H5Dpkg */ -/* Pablo information */ -/* (Put before include files to avoid problems with inline functions) */ - #include "H5private.h" /* Generic Functions */ #include "H5Dpkg.h" /* Dataset functions */ #include "H5Eprivate.h" /* Error handling */ diff --git a/src/H5private.h b/src/H5private.h index 2acdf6c..2b0e9e7 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1135,9 +1135,7 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); assert(asrt); \ \ /* Check function name */ \ - H5_CHECK_FUNCNAME(func_name); \ - \ - /* Start tracing */ \ + H5_CHECK_FUNCNAME(func_name); #define FUNC_ENTER_COMMON(func_name,asrt) \ static const char FUNC[]=#func_name; \ diff --git a/src/hdf5.lnt b/src/hdf5.lnt index 770b5a7..b67abc0 100755 --- a/src/hdf5.lnt +++ b/src/hdf5.lnt @@ -89,7 +89,7 @@ H5Zszip.c The following files have had their FUNC_ENTER, FUNC_LEAVE & HGOTO* - macros cleaned up and the PABLO_MASK adjusted, but have not been linted + macros cleaned up, but have not been linted due to their dependencies on features that we don't support on Windows: H5FDfphdf5.c H5FDgass.c -- cgit v0.12