From b39dd538ec81df8f65304e40ee6587a54b586577 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 23 Oct 2002 14:28:05 -0500 Subject: [svn-r6024] Purpose: Feature Add Description: Moved some functions from having only module scope to having public scope, but only available in the HDF5 internals (not public APIs). Platforms tested: Eirene, Arabica, Modi4 --- src/H5P.c | 37 ++++++++++++++++++------------------- src/H5Ppkg.h | 2 ++ src/H5Pprivate.h | 2 ++ 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/H5P.c b/src/H5P.c index e05ef3a..7913b78 100644 --- a/src/H5P.c +++ b/src/H5P.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 * -* 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. * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* $Id$ */ @@ -68,12 +70,8 @@ static H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class, H5P_cls_create_func_t cls_create, void *create_data, H5P_cls_copy_func_t cls_copy, void *copy_data, H5P_cls_close_func_t cls_close, void *close_data); -static herr_t H5P_close(void *_plist); -static herr_t H5P_close_class(void *_pclass); static herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name); static H5P_genprop_t *H5P_dup_prop(H5P_genprop_t *oprop); -static herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod); -static herr_t H5P_add_prop(H5P_genprop_t *hash[], unsigned hashsize, H5P_genprop_t *prop); static herr_t H5P_free_prop(H5P_genprop_t *prop); @@ -787,7 +785,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static herr_t +herr_t H5P_add_prop(H5P_genprop_t *hash[], unsigned hashsize, H5P_genprop_t *prop) { unsigned loc; /* Hash table location */ @@ -976,7 +974,7 @@ H5P_free_all_prop(H5P_genprop_t *hash[], unsigned hashsize, unsigned make_cb) EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static herr_t +herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod) { FUNC_ENTER_NOINIT(H5P_access_class); @@ -1501,6 +1499,7 @@ hid_t H5Pcreate(hid_t cls_id) /* Create the new property list */ if((ret_value=H5P_create_id(pclass))<0) HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list"); + done: FUNC_LEAVE (ret_value); } /* H5Pcreate() */ @@ -4527,7 +4526,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static herr_t +herr_t H5P_close(void *_plist) { H5P_genplist_t *plist=(H5P_genplist_t *)_plist; @@ -5020,7 +5019,7 @@ done: EXAMPLES REVISION LOG --------------------------------------------------------------------------*/ -static herr_t +herr_t H5P_close_class(void *_pclass) { H5P_genclass_t *pclass=(H5P_genclass_t *)_pclass; diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h index 475bfef..b600769 100644 --- a/src/H5Ppkg.h +++ b/src/H5Ppkg.h @@ -92,6 +92,8 @@ struct H5P_genplist_t { }; /* Private functions, not part of the publicly documented API */ +H5_DLL herr_t H5P_add_prop(H5P_genprop_t *hash[], unsigned hashsize, H5P_genprop_t *prop); +H5_DLL herr_t H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod); #endif /* _H5Ppkg_H */ diff --git a/src/H5Pprivate.h b/src/H5Pprivate.h index f0eefd1..dca48be 100644 --- a/src/H5Pprivate.h +++ b/src/H5Pprivate.h @@ -29,6 +29,7 @@ typedef struct H5P_genclass_t H5P_genclass_t; H5_DLL herr_t H5P_init(void); /* Internal versions of API routines */ +H5_DLL herr_t H5P_close(void *_plist); H5_DLL hid_t H5P_create_id(H5P_genclass_t *pclass); H5_DLL hid_t H5P_copy_plist(H5P_genplist_t *old_plist); H5_DLL herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value); @@ -42,6 +43,7 @@ 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, -- cgit v0.12