[svn-r6878] Purpose:

    Code cleanup

Description:
    Limit the scope on more function prototypes/macros/typedefs.

Platforms tested:
    FreeBSD 4.8 (sleipnir)
    h5committest not necessary.

1 files changed, 3 insertions, 18 deletions

diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h
index b9a9f93..bb89ae2 100644
--- a/src/H5Pprivate.h
+++ b/src/H5Pprivate.h
@@ -18,18 +18,17 @@
 #ifndef _H5Pprivate_H
 #define _H5Pprivate_H
 
+/* Include package's public header */
 #include "H5Ppublic.h"
 
 /* Private headers needed by this file */
-#include "H5private.h"
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Oprivate.h"		/* Object headers		  	*/
 
 /* Forward declarations for anonymous H5P objects */
 typedef struct H5P_genplist_t H5P_genplist_t;
 typedef struct H5P_genclass_t H5P_genclass_t;
 
-/* Forward declarations for prototypes arguments */
-struct H5O_fill_t;
-
 /* Private functions, not part of the publicly documented API */
 H5_DLL herr_t H5P_init(void);
 
@@ -46,9 +45,6 @@ H5_DLL herr_t H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
 H5_DLL herr_t H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name);
 H5_DLL htri_t H5P_exist_plist(H5P_genplist_t *plist, const char *name);
 H5_DLL char *H5P_get_class_name(H5P_genclass_t *pclass);
-H5_DLL char *H5P_get_class_path(H5P_genclass_t *pclass);
-H5_DLL H5P_genclass_t *H5P_open_class_path(const char *path);
-H5_DLL herr_t H5P_close_class(void *_pclass);
 H5_DLL herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops);
 H5_DLL herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size,
             void *def_value, H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
@@ -58,10 +54,6 @@ H5_DLL hid_t H5P_get_driver(H5P_genplist_t *plist);
 H5_DLL void * H5P_get_driver_info(H5P_genplist_t *plist);
 H5_DLL herr_t H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id,
             const void *new_driver_info);
-H5_DLL herr_t H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset);
-H5_DLL herr_t H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset);
-H5_DLL herr_t H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type);
-H5_DLL herr_t H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type);
 H5_DLL herr_t H5P_set_vlen_mem_manager(H5P_genplist_t *plist,
         H5MM_allocate_t alloc_func, void *alloc_info, H5MM_free_t free_func,
         void *free_info);
@@ -74,17 +66,10 @@ H5_DLL herr_t H5P_fill_value_defined(H5P_genplist_t *plist,
 H5_DLL htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id);
 H5_DLL void *H5P_object_verify(hid_t plist_id, hid_t pclass_id);
 
-/* Testing functions */
-#ifdef H5P_TESTING
-H5_DLL char *H5P_get_class_path_test(hid_t pclass_id);
-H5_DLL hid_t H5P_open_class_path_test(const char *path);
-#endif /* H5P_TESTING */
-
 /* Private functions to "peek" at properties of a certain type */
 H5_DLL unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name);
 H5_DLL hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name);
 H5_DLL void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name);
-H5_DLL hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name);
 H5_DLL size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name);
 
 #endif