diff --git a/CMakeLists.txt b/CMakeLists.txt index e396e361b0..b4415cb25e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -232,9 +232,9 @@ set (HDF4_SRC_INCLUDE_DIRS ${HDF4_HDFSOURCE_DIR} ${HDF4_MFHDFSOURCE_DIR}) set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${CMAKE_MODULE_PATH}) #----------------------------------------------------------------------------- -# parse the full version number from hfile.h and include in H4_VERS_INFO +# parse the full version number from hfile_priv.h and include in H4_VERS_INFO #----------------------------------------------------------------------------- -file (READ ${HDF4_HDFSOURCE_DIR}/hfile.h _hfile_h_contents) +file (READ ${HDF4_HDFSOURCE_DIR}/hfile_priv.h _hfile_h_contents) string (REGEX REPLACE ".*#define[ \t]+LIBVER_MAJOR[ \t]+([0-9]*).*$" "\\1" H4_VERS_MAJOR ${_hfile_h_contents}) string (REGEX REPLACE ".*#define[ \t]+LIBVER_MINOR[ \t]+([0-9]*).*$" diff --git a/bin/h4_release_check.sh b/bin/h4_release_check.sh index df4e15f711..671350e4d2 100755 --- a/bin/h4_release_check.sh +++ b/bin/h4_release_check.sh @@ -83,12 +83,11 @@ fi # TESTING IF FILES EXISTS ######################### -include_file=(atom.h bitvect.h cdeflate.h cnbit.h cnone.h crle.h cskphuff.h cszip.h dfan.h -dffunc.f90 dffunc.inc dfgr.h df.h dfrig.h dfsd.h dfufp2i.h dynarray.h H4api_adpt.h -h4config.h hbitio.h hchunks.h hcomp.h hcompi.h hconv.h hdatainfo.h hdf2netcdf.h hdf.f90 -hdf.h hdfi.h hdf.inc herr.h hfile.h hkit.h hlimits.h hntdefs.h hproto_fortran.h hproto.h -htags.h linklist.h local_nc.h mfan.h mfani.h mfdatainfo.h mffunc.f90 mffunc.inc mfgr.h -mfgri.h mfhdf.h mfhdfi.h mstdio.h netcdf.f90 netcdf.h netcdf.inc tbbt.h vg.h) +include_file=( +dffunc.f90 dffunc.inc H4api_adpt.h h4config.h hbitio.h hcomp.h hdatainfo.h +hdf2netcdf.h hdf.f90 hdf.h hdf.inc herr.h hlimits.h hntdefs.h hproto_fortran.h hproto.h +htags.h mfan.h mfdatainfo.h mffunc.f90 mffunc.inc mfgr.h mfhdf.h netcdf.f90 netcdf.h +netcdf.inc vg.h) lib_file=(libdf.a libdf.la libhdf4.settings libjpeg.a libmfhdf.a libmfhdf.la libsz.a libz.a) diff --git a/bin/h4vers b/bin/h4vers index 15e9bba9d8..9f6b5d7a74 100755 --- a/bin/h4vers +++ b/bin/h4vers @@ -27,7 +27,7 @@ use strict; ### Purpose # Increments the hdf4 version number by changing the value of -# constants in the hdf/src/hfile.h file. The new version number is +# constants in the hdf/src/hfile_priv.h file. The new version number is # printed on the standard output. An alternate source file name can be # specified as an argument. In any case, the original file is saved # by appending a tilde `~' to the name. @@ -61,11 +61,11 @@ use strict; # and the annotation string is cleared. # # If a file is specified then that file is used instead of -# ./hfile.h or ./hdf/src/hfile.h. +# ./hfile_priv.h or ./hdf/src/hfile_priv.h. # # If the version number is changed (either `-s' or `-i' was used on # the command line) then the first line of the README.md and -# release_notes/RELEASE.txt two levels above the hfile.h file are also +# release_notes/RELEASE.txt two levels above the hfile_priv.h file are also # modified so it looks something like: This is hdf4-1.2.3-pre1 currently # under development. The AC_INIT macro in configure.in will also change # in this case to be something like: AC_INIT([HDF4], [hdf4-1.2.3-pre1], @@ -128,15 +128,15 @@ Usage: $prog [OPTS] [FILE] as \"version 1.1 release 0 (pre1)\" will be printed. FILE The name of the file that contains version information. This is - seldom necessary since files hfile.h, hdf/src/hfile.h, - src/hfile.h, and ../hdf/src/hfile.h are automatically checked. + seldom necessary since files hfile_priv.h, hdf/src/hfile_priv.h, + src/hfile_priv.h, and ../hdf/src/hfile_priv.h are automatically checked. EOF exit 1; } # Parse arguments my ($verbose, $set, $inc, $file, $rc); -my (@files) = ("hdf/src/hfile.h", "../hdf/src/hfile.h", "src/hfile.h", "hfile.h"); +my (@files) = ("hdf/src/hfile_priv.h", "../hdf/src/hfile_priv.h", "src/hfile_priv.h", "hfile_priv.h"); while ($_ = shift) { $_ eq "-s" && do { die "-s switch needs a version number\n" unless @ARGV; @@ -168,12 +168,12 @@ die "mutually exclusive options given\n" if $set && $inc; #print "file is $file.\n"; #print "File array is ", @files; -# Determine file to use as hfile.h, README.md, +# Determine file to use as hfile_priv.h, README.md, # release_notes/RELEASE.txt, configure.in, # and config/cmake/scripts/HDF4config.cmake. # The paths to README.md, release_notes/RELEASE.txt, configure.ac, # and config/cmake/scripts/HDF4config.cmake -# files are always from the directory two levels above hfile.h. +# files are always from the directory two levels above hfile_priv.h. unless ($file) { for (@files) { ($file=$_,last) if -f $_; diff --git a/hdf/src/CMakeLists.txt b/hdf/src/CMakeLists.txt index 6899eb3b9e..3f5aab6993 100644 --- a/hdf/src/CMakeLists.txt +++ b/hdf/src/CMakeLists.txt @@ -77,43 +77,44 @@ set (HDF4_HDF_SRC_CHDRS ${HDF4_HDF_SRC_SOURCE_DIR}/hntdefs.h ${HDF4_HDF_SRC_SOURCE_DIR}/hproto.h ${HDF4_HDF_SRC_SOURCE_DIR}/htags.h + ${HDF4_HDF_SRC_SOURCE_DIR}/mfan.h ${HDF4_HDF_SRC_SOURCE_DIR}/mfgr.h ${HDF4_HDF_SRC_SOURCE_DIR}/vg.h ) +# Internal headers end in _priv.h set (HDF4_PRIVATE_HDF_SRC_CHDRS - ${HDF4_HDF_SRC_SOURCE_DIR}/atom.h - ${HDF4_HDF_SRC_SOURCE_DIR}/bitvect.h - ${HDF4_HDF_SRC_SOURCE_DIR}/cdeflate.h - ${HDF4_HDF_SRC_SOURCE_DIR}/cnbit.h - ${HDF4_HDF_SRC_SOURCE_DIR}/cnone.h - ${HDF4_HDF_SRC_SOURCE_DIR}/crle.h - ${HDF4_HDF_SRC_SOURCE_DIR}/cskphuff.h - ${HDF4_HDF_SRC_SOURCE_DIR}/cszip.h - ${HDF4_HDF_SRC_SOURCE_DIR}/df.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dfan.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dfgr.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dfrig.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dfsd.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dfufp2i.h - ${HDF4_HDF_SRC_SOURCE_DIR}/dynarray.h - ${HDF4_HDF_SRC_SOURCE_DIR}/glist.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hchunks.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hcompi.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hconv.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hdfi.h + ${HDF4_HDF_SRC_SOURCE_DIR}/atom_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/bitvect_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/cdeflate_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/cnbit_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/cnone_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/crle_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/cskphuff_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/cszip_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/df_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dfan_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dfgr_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dfrig_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dfsd_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dfufp2i_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/dynarray_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/glist_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hchunks_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hcomp_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hconv_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hdf_priv.h ${HDF4_HDF_SRC_SOURCE_DIR}/herr_priv.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hfile.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hkit.h - ${HDF4_HDF_SRC_SOURCE_DIR}/hqueue.h - ${HDF4_HDF_SRC_SOURCE_DIR}/linklist.h - ${HDF4_HDF_SRC_SOURCE_DIR}/mcache.h - ${HDF4_HDF_SRC_SOURCE_DIR}/mfan.h - ${HDF4_HDF_SRC_SOURCE_DIR}/mfani.h - ${HDF4_HDF_SRC_SOURCE_DIR}/mfgri.h - ${HDF4_HDF_SRC_SOURCE_DIR}/mstdio.h - ${HDF4_HDF_SRC_SOURCE_DIR}/tbbt.h - ${HDF4_HDF_SRC_SOURCE_DIR}/vgint.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hfile_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hkit_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/hqueue_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/linklist_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/mcache_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/mfan_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/mfgr_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/mstdio_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/tbbt_priv.h + ${HDF4_HDF_SRC_SOURCE_DIR}/vg_priv.h ) if (BUILD_STATIC_LIBS) diff --git a/hdf/src/Makefile.am b/hdf/src/Makefile.am index c9cc6b7edf..063cf36714 100644 --- a/hdf/src/Makefile.am +++ b/hdf/src/Makefile.am @@ -21,7 +21,7 @@ CSOURCES = atom.c bitvect.c cdeflate.c cnbit.c cnone.c crle.c cskphuff.c \ vgp.c vhi.c vio.c vparse.c vrw.c vsfld.c CHEADERS = H4api_adpt.h h4config.h hbitio.h hcomp.h hdatainfo.h hdf.h \ - herr.h hlimits.h hntdefs.h hproto.h htags.h mfgr.h vg.h + herr.h hlimits.h hntdefs.h hproto.h htags.h mfan.h mfgr.h vg.h FHEADERS = dffunc.f90 hdf.f90 dffunc.inc hdf.inc diff --git a/hdf/src/atom.c b/hdf/src/atom.c index ac8c22b5aa..bb1fd502b5 100644 --- a/hdf/src/atom.c +++ b/hdf/src/atom.c @@ -23,7 +23,7 @@ DESIGN The groups are stored in an array of pointers to store each group in an element. Each "atomic group" node contains a link to a hash table to manage the atoms in each group. The allowed "atomic groups" are stored - in an enum (called group_t) in atom.h. + in an enum (called group_t) in atom_priv.h. BUGS/LIMITATIONS Can't iterate over the atoms in a group. @@ -46,8 +46,8 @@ EXPORTED ROUTINES HAshutdown - Terminate various static buffers. */ -#include "hdfi.h" -#include "atom.h" +#include "hdf_priv.h" +#include "atom_priv.h" /* # of bits to use for Group ID in each atom (change if MAXGROUP>16) */ #define GROUP_BITS 4 diff --git a/hdf/src/atom.h b/hdf/src/atom_priv.h similarity index 97% rename from hdf/src/atom.h rename to hdf/src/atom_priv.h index 042db4d636..aab31e8647 100644 --- a/hdf/src/atom.h +++ b/hdf/src/atom_priv.h @@ -12,19 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: atom.h + * File: atom_priv.h * Purpose: header file for atom API - * Dependencies: - * Invokes: - * Contents: - * Structure definitions: - * Constant definitions: *---------------------------------------------------------------------------*/ -#ifndef H4_ATOM_H -#define H4_ATOM_H +#ifndef H4_ATOM_PRIV_H +#define H4_ATOM_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Do swap using XOR operator. Ugly but fast... -QAK */ #define HAIswap_cache(i, j) \ @@ -208,4 +203,4 @@ HDFLIBAPI intn HAshutdown(void); } #endif -#endif /* H4_ATOM_H */ +#endif /* H4_ATOM_PRIV_H */ diff --git a/hdf/src/bitvect.c b/hdf/src/bitvect.c index 5ec9f592e6..afe81ecb19 100644 --- a/hdf/src/bitvect.c +++ b/hdf/src/bitvect.c @@ -36,8 +36,8 @@ DESIGN for finding 1 bits as that is not a use case in the HDF4 library. */ -#include "hdfi.h" -#include "bitvect.h" +#include "hdf_priv.h" +#include "bitvect_priv.h" /* Base type of the array used to store the bits */ typedef uint8 bv_base; diff --git a/hdf/src/bitvect.h b/hdf/src/bitvect_priv.h similarity index 93% rename from hdf/src/bitvect.h rename to hdf/src/bitvect_priv.h index b595c779f9..5a59092576 100644 --- a/hdf/src/bitvect.h +++ b/hdf/src/bitvect_priv.h @@ -12,14 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: bitvect.h + * File: bitvect_priv.h * Purpose: header file for bit-vector API *---------------------------------------------------------------------------*/ -#ifndef H4_BITVECT_H -#define H4_BITVECT_H +#ifndef H4_BITVECT_PRIV_H +#define H4_BITVECT_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Boolean values used */ typedef enum { BV_FALSE = 0, BV_TRUE = 1 } bv_bool; @@ -55,4 +55,4 @@ HDFLIBAPI int32 bv_find_next_zero(bv_ptr b); } #endif -#endif /* H4_BITVECT_H */ +#endif /* H4_BITVECT_PRIV_H */ diff --git a/hdf/src/cdeflate.c b/hdf/src/cdeflate.c index 659ad2fc89..9b91bcfda4 100644 --- a/hdf/src/cdeflate.c +++ b/hdf/src/cdeflate.c @@ -12,27 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - cdeflate.c - HDF gzip 'deflate' encoding I/O routines + cdeflate.c - HDF gzip 'deflate' encoding I/O routines - REMARKS - - DESIGN - - EXPORTED ROUTINES None of these routines are designed to be called by other users except for the modeling layer of the compression routines. - - AUTHOR - Quincey Koziol */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* Define the [default] size of the buffer to interact with the file */ #define DEFLATE_BUF_SIZE 4096 diff --git a/hdf/src/cdeflate.h b/hdf/src/cdeflate_priv.h similarity index 93% rename from hdf/src/cdeflate.h rename to hdf/src/cdeflate_priv.h index a9f8dd7beb..4cd339432a 100644 --- a/hdf/src/cdeflate.h +++ b/hdf/src/cdeflate_priv.h @@ -12,15 +12,15 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: cdeflate.h + * File: cdeflate_priv.h * Purpose: Header file for gzip 'deflate' encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h *---------------------------------------------------------------------------*/ -#ifndef H4_CDEFLATE_H -#define H4_CDEFLATE_H +#ifndef H4_CDEFLATE_PRIV_H +#define H4_CDEFLATE_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Get the gzip 'deflate' header */ #define intf zintf @@ -67,4 +67,4 @@ HDFLIBAPI intn HCPcdeflate_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CDEFLATE_H */ +#endif /* H4_CDEFLATE_PRIV_H */ diff --git a/hdf/src/cnbit.c b/hdf/src/cnbit.c index b1056f09e2..ce0b73e4a2 100644 --- a/hdf/src/cnbit.c +++ b/hdf/src/cnbit.c @@ -12,24 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - cnbit.c - HDF N-bit encoding I/O routines + cnbit.c - HDF N-bit encoding I/O routines - REMARKS - - DESIGN - - EXPORTED ROUTINES None of these routines are designed to be called by other users except for the modeling layer of the compression routines. */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* functions to perform N-bit encoding */ funclist_t cnbit_funcs = {HCPcnbit_stread, diff --git a/hdf/src/cnbit.h b/hdf/src/cnbit_priv.h similarity index 95% rename from hdf/src/cnbit.h rename to hdf/src/cnbit_priv.h index ca50cbe542..e66603f8ee 100644 --- a/hdf/src/cnbit.h +++ b/hdf/src/cnbit_priv.h @@ -12,15 +12,15 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: cnbit.h + * File: cnbit_priv.h * Purpose: Header file for N-bit encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h *---------------------------------------------------------------------------*/ -#ifndef H4_CNBIT_H -#define H4_CNBIT_H +#ifndef H4_CNBIT_PRIV_H +#define H4_CNBIT_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* size of the N-bit buffer */ #define NBIT_BUF_SIZE (MAX_NT_SIZE * 64) @@ -80,4 +80,4 @@ HDFLIBAPI intn HCPcnbit_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CNBIT_H */ +#endif /* H4_CNBIT_PRIV_H */ diff --git a/hdf/src/cnone.c b/hdf/src/cnone.c index 9e94724f0a..0d30d9bc73 100644 --- a/hdf/src/cnone.c +++ b/hdf/src/cnone.c @@ -12,26 +12,20 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - cnone.c - HDF none encoding I/O routines + cnone.c - HDF none encoding I/O routines - REMARKS These routines are only included for completeness and are not actually expected to be used. - DESIGN - - EXPORTED ROUTINES None of these routines are designed to be called by other users except for the modeling layer of the compression routines. */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* functions to perform run-length encoding */ funclist_t cnone_funcs = {HCPcnone_stread, diff --git a/hdf/src/cnone.h b/hdf/src/cnone_priv.h similarity index 92% rename from hdf/src/cnone.h rename to hdf/src/cnone_priv.h index 9b8167b9f3..489d89656d 100644 --- a/hdf/src/cnone.h +++ b/hdf/src/cnone_priv.h @@ -12,18 +12,18 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: cnone.h + * File: cnone_priv.h * Purpose: Header file for "none" encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h * Invokes: none * Contents: Structures & definitions for "none" encoding. This header * should only be included in hcomp.c and cnone.c. *---------------------------------------------------------------------------*/ -#ifndef H4_CNONE_H -#define H4_CNONE_H +#ifndef H4_CNONE_PRIV_H +#define H4_CNONE_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* "none" [en|de]coding information */ typedef struct { @@ -60,4 +60,4 @@ HDFLIBAPI intn HCPcnone_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CNONE_H */ +#endif /* H4_CNONE_PRIV_H */ diff --git a/hdf/src/crle.c b/hdf/src/crle.c index e60e4a1e98..a18641084e 100644 --- a/hdf/src/crle.c +++ b/hdf/src/crle.c @@ -12,24 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - crle.c - HDF run-length encoding I/O routines + crle.c - HDF run-length encoding I/O routines - REMARKS - - DESIGN - - EXPORTED ROUTINES None of these routines are designed to be called by other users except for the modeling layer of the compression routines. */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* internal defines */ #define TMP_BUF_SIZE 8192 /* size of throw-away buffer */ diff --git a/hdf/src/crle.h b/hdf/src/crle_priv.h similarity index 95% rename from hdf/src/crle.h rename to hdf/src/crle_priv.h index 9d10832c50..a90fa6a708 100644 --- a/hdf/src/crle.h +++ b/hdf/src/crle_priv.h @@ -12,20 +12,18 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: crle.h + * File: crle_priv.h * Purpose: Header file for run-length encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h * Invokes: none * Contents: Structures & definitions for run-length encoding. This header * should only be included in hcomp.c and crle.c. - * Structure definitions: - * Constant definitions: *---------------------------------------------------------------------------*/ -#ifndef H4_CRLE_H -#define H4_CRLE_H +#ifndef H4_CRLE_PRIV_H +#define H4_CRLE_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* size of the RLE buffer */ #define RLE_BUF_SIZE 128 @@ -103,4 +101,4 @@ HDFLIBAPI intn HCPcrle_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CRLE_H */ +#endif /* H4_CRLE_PRIV_H */ diff --git a/hdf/src/cskphuff.c b/hdf/src/cskphuff.c index 212c263b59..9d52595366 100644 --- a/hdf/src/cskphuff.c +++ b/hdf/src/cskphuff.c @@ -12,15 +12,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - cskphuff.c - HDF "skipping" huffman encoding I/O routines + cskphuff.c - HDF "skipping" huffman encoding I/O routines - REMARKS - - DESIGN - - EXPORTED ROUTINES None of these routines are designed to be called by other users except for the modeling layer of the compression routines. */ @@ -31,10 +24,10 @@ */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* Internal Defines */ #define TMP_BUF_SIZE 8192 /* size of throw-away buffer */ diff --git a/hdf/src/cskphuff.h b/hdf/src/cskphuff_priv.h similarity index 93% rename from hdf/src/cskphuff.h rename to hdf/src/cskphuff_priv.h index 4040ad4716..b644b4acf0 100644 --- a/hdf/src/cskphuff.h +++ b/hdf/src/cskphuff_priv.h @@ -12,15 +12,15 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: cskphuff.h + * File: cskphuff_priv.h * Purpose: Header file for skipping huffman encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h *---------------------------------------------------------------------------*/ -#ifndef H4_CSKPHUFF_H -#define H4_CSKPHUFF_H +#ifndef H4_CSKPHUFF_PRIV_H +#define H4_CSKPHUFF_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* The maximum source character code: */ #define SKPHUFF_MAX_CHAR 255 @@ -74,4 +74,4 @@ HDFLIBAPI intn HCPcskphuff_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CSKPHUFF_H */ +#endif /* H4_CSKPHUFF_PRIV_H */ diff --git a/hdf/src/cszip.c b/hdf/src/cszip.c index db1bdb6914..c3bb5296fc 100644 --- a/hdf/src/cszip.c +++ b/hdf/src/cszip.c @@ -13,14 +13,14 @@ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" #ifdef H4_HAVE_LIBSZ #include "szlib.h" #endif /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* internal defines */ #define TMP_BUF_SIZE 8192 /* size of throw-away buffer */ diff --git a/hdf/src/cszip.h b/hdf/src/cszip_priv.h similarity index 94% rename from hdf/src/cszip.h rename to hdf/src/cszip_priv.h index eae0eab359..09bc891dcd 100644 --- a/hdf/src/cszip.h +++ b/hdf/src/cszip_priv.h @@ -12,18 +12,18 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: cszip.h + * File: cszip_priv.h * Purpose: Header file for szip encoding information. - * Dependencies: should only be included from hcompi.h + * Dependencies: should only be included from hcomp_priv.h * Invokes: none * Contents: Structures & definitions for szip encoding. This header * should only be included in hcomp.c and cszip.c. *---------------------------------------------------------------------------*/ -#ifndef H4_CSZIP_H -#define H4_CSZIP_H +#ifndef H4_CSZIP_PRIV_H +#define H4_CSZIP_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Special parameters for szip compression */ /* [These are aliases for the similar definitions in ricehdf.h header file] */ @@ -88,4 +88,4 @@ HDFLIBAPI intn HCPcszip_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_CSZIP_H */ +#endif /* H4_CSZIP_PRIV_H */ diff --git a/hdf/src/df24.c b/hdf/src/df24.c index 2d064d6206..e68f6d9026 100644 --- a/hdf/src/df24.c +++ b/hdf/src/df24.c @@ -35,8 +35,8 @@ * dimension, compression, color compensation etc. *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfgr.h" +#include "hdf_priv.h" +#include "dfgr_priv.h" static intn Newdata = 0; /* does Readrig contain fresh data? */ static intn dimsset = 0; /* have dimensions been set? */ diff --git a/hdf/src/df24f.c b/hdf/src/df24f.c index 019b90cd25..22a14ac2aa 100644 --- a/hdf/src/df24f.c +++ b/hdf/src/df24f.c @@ -37,8 +37,8 @@ * dimension, compression, color compensation etc. *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfgr.h" +#include "hdf_priv.h" +#include "dfgr_priv.h" #include "hproto_fortran.h" #define LUT 0 diff --git a/hdf/src/df.h b/hdf/src/df_priv.h similarity index 95% rename from hdf/src/df.h rename to hdf/src/df_priv.h index 433ccc3383..14bb699d6b 100644 --- a/hdf/src/df.h +++ b/hdf/src/df_priv.h @@ -12,22 +12,15 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: df.h + * File: df_priv.h * Purpose: header file for HDF routines * Invokes: * Contents: * Structure definitions: DFddh, DFdd, DFdesc, DFdle, DF, DFdi, DFdata - * Procedure type definitions - * Global variables - * Tag definitions - * Error return codes - * Logical constants - * Remarks: This file is included with user programs - * Since it includes stdio.h etc., do not include these after df.h *---------------------------------------------------------------------------*/ -#ifndef H4_DF_H -#define H4_DF_H +#ifndef H4_DF_PRIV_H +#define H4_DF_PRIV_H #include "H4api_adpt.h" @@ -169,4 +162,4 @@ HDFLIBAPI int DFconvert(uint8 *source, uint8 *dest, int ntype, int sourcetype, i } #endif -#endif /* H4_DF_H */ +#endif /* H4_DF_PRIV_H */ diff --git a/hdf/src/dfan.c b/hdf/src/dfan.c index 1f6504a9c0..fbaaad4553 100644 --- a/hdf/src/dfan.c +++ b/hdf/src/dfan.c @@ -51,8 +51,8 @@ * DFANIgetfann: - get file annotation *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfan.h" +#include "hdf_priv.h" +#include "dfan_priv.h" static uint16 Lastref = 0; /* Last ref read/written */ static uint16 Next_label_ref = 0; /* Next file label ref to read/write */ diff --git a/hdf/src/dfan.h b/hdf/src/dfan_priv.h similarity index 94% rename from hdf/src/dfan.h rename to hdf/src/dfan_priv.h index e0e2960bb2..94567827ef 100644 --- a/hdf/src/dfan.h +++ b/hdf/src/dfan_priv.h @@ -12,18 +12,18 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*------------------------------------------------------------------------------ - * File: dfan.h + * File: dfan_priv.h * Purpose: header file for the Annotations set - * Invokes: df.h + * Invokes: df_priv.h * Contents: * Structure definitions: DFANdirentry, DFANdirhead * Constant definitions: DFAN_LABEL, DFAN_DESC *----------------------------------------------------------------------------*/ -#ifndef H4_DFAN_H -#define H4_DFAN_H +#ifndef H4_DFAN_PRIV_H +#define H4_DFAN_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" #define DFAN_LABEL 0 #define DFAN_DESC 1 @@ -55,4 +55,4 @@ typedef struct DFANdirhead { DFANdirentry *entries; /* actually an arbitrary size array */ } DFANdirhead; -#endif /* H4_DFAN_H */ +#endif /* H4_DFAN_PRIV_H */ diff --git a/hdf/src/dfanf.c b/hdf/src/dfanf.c index e11374039a..fd2020f983 100644 --- a/hdf/src/dfanf.c +++ b/hdf/src/dfanf.c @@ -39,9 +39,9 @@ * daiafid_ : add file id (intermediate routine) *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfan.h" -#include "df.h" +#include "hdf_priv.h" +#include "dfan_priv.h" +#include "df_priv.h" #include "hproto_fortran.h" /* conventions used in forming names of routines: diff --git a/hdf/src/dfcomp.c b/hdf/src/dfcomp.c index ac7a26810d..0d6625fbcb 100644 --- a/hdf/src/dfcomp.c +++ b/hdf/src/dfcomp.c @@ -26,7 +26,7 @@ /* This module (dfcomp.c) used to be in charge of the general compression * information but hcomp.c now supersedes it */ -#include "hdfi.h" +#include "hdf_priv.h" #define R8_MAX_BLOCKS 32 #define R8_MAX_LENGTH 512 diff --git a/hdf/src/dfconv.c b/hdf/src/dfconv.c index 493fc4ca3c..3ed3325e59 100644 --- a/hdf/src/dfconv.c +++ b/hdf/src/dfconv.c @@ -61,8 +61,8 @@ /* */ /*****************************************************************************/ -#include "hdfi.h" -#include "hconv.h" +#include "hdf_priv.h" +#include "hconv_priv.h" /* ** Static function prototypes diff --git a/hdf/src/dff.c b/hdf/src/dff.c index 4d7ad5e18f..883e41051a 100644 --- a/hdf/src/dff.c +++ b/hdf/src/dff.c @@ -38,8 +38,8 @@ * dfiishdf: call DFishdf to get HDF string *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "df.h" +#include "hdf_priv.h" +#include "df_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dfgr.c b/hdf/src/dfgr.c index 53843e2428..02f4f9c68a 100644 --- a/hdf/src/dfgr.c +++ b/hdf/src/dfgr.c @@ -14,7 +14,7 @@ /*----------------------------------------------------------------------------- * File: dfgr.c * Purpose: read and write general raster images - * Invokes: df.c, dfkit.c, dfcomp.c, dfgroup.c, dfgr.h + * Invokes: df.c, dfkit.c, dfcomp.c, dfgroup.c, dfgr_priv.h * Contents: * DFGRgetlutdims : get dimensions of lookup table * DFGRreqlutil : use this interlace when returning lookup table @@ -43,8 +43,8 @@ * dimension, compression, color compensation etc. *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfgr.h" +#include "hdf_priv.h" +#include "dfgr_priv.h" static char *Grlastfile = NULL; static uint8 *Grlutdata = NULL; /* points to lut, if in memory */ diff --git a/hdf/src/dfgr.h b/hdf/src/dfgr_priv.h similarity index 93% rename from hdf/src/dfgr.h rename to hdf/src/dfgr_priv.h index 5c1994b743..7c9207f8ba 100644 --- a/hdf/src/dfgr.h +++ b/hdf/src/dfgr_priv.h @@ -12,18 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: dfgr.h + * File: dfgr_priv.h * Purpose: header file for the Raster Image set - * Invokes: df.h + * Invokes: df_priv.h * Contents: * Structure definitions: DFGRdr, DFGRrig - * Remarks: This is included with user programs which use general raster *---------------------------------------------------------------------------*/ -#ifndef H4_DFGR_H -#define H4_DFGR_H +#ifndef H4_DFGR_PRIV_H +#define H4_DFGR_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* description record: used to describe image data, palette data etc. */ typedef struct { @@ -65,4 +64,4 @@ HDFLIBAPI int32 DFGRIopen(const char *filename, int acc_mode); } #endif -#endif /* H4_DFGR_H */ +#endif /* H4_DFGR_PRIV_H */ diff --git a/hdf/src/dfgroup.c b/hdf/src/dfgroup.c index a3e4232593..2480e8b033 100644 --- a/hdf/src/dfgroup.c +++ b/hdf/src/dfgroup.c @@ -26,8 +26,8 @@ * Each tag/ref combination is called a data identifier (DI). *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" typedef struct DIlist_struct { uint8 *DIlist; diff --git a/hdf/src/dfimcomp.c b/hdf/src/dfimcomp.c index 698dfcd7c2..9a41dd17dc 100644 --- a/hdf/src/dfimcomp.c +++ b/hdf/src/dfimcomp.c @@ -22,7 +22,7 @@ /* DFCunimcomp(), sqr() */ /************************************************************************/ -#include "hdfi.h" +#include "hdf_priv.h" #define PALSIZE 256 #define BIT8 0 diff --git a/hdf/src/dfjpeg.c b/hdf/src/dfjpeg.c index 596d28d0ba..e3b19c4338 100644 --- a/hdf/src/dfjpeg.c +++ b/hdf/src/dfjpeg.c @@ -22,7 +22,7 @@ * that has to know about how to use the JPEG routines. *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" /* Hack to prevent libjpeg from re-defining `boolean` in a way that clashes * with windows.h. This MUST come before including jpeglib.h. diff --git a/hdf/src/dfknat.c b/hdf/src/dfknat.c index bdc1a7a7b9..268f668887 100644 --- a/hdf/src/dfknat.c +++ b/hdf/src/dfknat.c @@ -17,8 +17,6 @@ Purpose: Routines to support "native mode" conversion to and from HDF format - Invokes: - PRIVATE conversion functions: DFKnb1b - Native mode for 8 bit integers DFKnb2b - Native mode for 16 bit integers @@ -47,8 +45,8 @@ /* */ /*****************************************************************************/ -#include "hdfi.h" -#include "hconv.h" +#include "hdf_priv.h" +#include "hconv_priv.h" /*****************************************************************************/ /* NATIVE MODE NUMBER "CONVERSION" ROUTINES */ diff --git a/hdf/src/dfkswap.c b/hdf/src/dfkswap.c index 638b250d3d..b8a372b6eb 100644 --- a/hdf/src/dfkswap.c +++ b/hdf/src/dfkswap.c @@ -17,8 +17,6 @@ Purpose: Routines to support little-endian conversion to and from HDF format - Invokes: - PRIVATE conversion functions: DFKsb2b - Byte swapping for 16 bit integers DFKsb4b - Byte swapping for 32 bit integers @@ -46,8 +44,8 @@ /* */ /*****************************************************************************/ -#include "hdfi.h" -#include "hconv.h" +#include "hdf_priv.h" +#include "hconv_priv.h" /*****************************************************************************/ /* NUMBER CONVERSION ROUTINES FOR BYTE SWAPPING */ diff --git a/hdf/src/dfp.c b/hdf/src/dfp.c index 2a14a3330a..897c99532b 100644 --- a/hdf/src/dfp.c +++ b/hdf/src/dfp.c @@ -27,7 +27,7 @@ * DFPIopen : open/reopen file *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" /* remember that '0' is invalid ref number */ static uint16 Readref = 0; diff --git a/hdf/src/dfpf.c b/hdf/src/dfpf.c index 82648a59ff..c7e03d47e7 100644 --- a/hdf/src/dfpf.c +++ b/hdf/src/dfpf.c @@ -28,7 +28,7 @@ * Remarks: none *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dfr8.c b/hdf/src/dfr8.c index 4888cdea5a..59b6efe836 100644 --- a/hdf/src/dfr8.c +++ b/hdf/src/dfr8.c @@ -14,7 +14,7 @@ /*----------------------------------------------------------------------------- * File: dfr8.c * Purpose: read and write 8-bit Raster Image Groups - * Invokes: df.c, dfcomp.c, dfgroup.c, dfrig.h + * Invokes: df.c, dfcomp.c, dfgroup.c, dfrig_priv.h * Contents: * DFR8setpalette : specify palette to be used with subsequent 8-bit images * DFR8setcompress : Set the compression for next image written @@ -40,8 +40,8 @@ * The palette is arranged as RGBRGB... *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfrig.h" +#include "hdf_priv.h" +#include "dfrig_priv.h" /* Private Variables */ static uint8 *paletteBuf = NULL; diff --git a/hdf/src/dfr8f.c b/hdf/src/dfr8f.c index f9f9fca7c3..b92877f914 100644 --- a/hdf/src/dfr8f.c +++ b/hdf/src/dfr8f.c @@ -31,7 +31,7 @@ * dfr8restart: Call DFR8restart to reset sequencing to first image *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dfrig.h b/hdf/src/dfrig_priv.h similarity index 94% rename from hdf/src/dfrig.h rename to hdf/src/dfrig_priv.h index 167147ace9..d932450dac 100644 --- a/hdf/src/dfrig.h +++ b/hdf/src/dfrig_priv.h @@ -12,18 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: dfrig.h + * File: dfrig_priv.h * Purpose: header file for the Raster Image set - * Invokes: df.h + * Invokes: df_priv.h * Contents: * Structure definitions: DFRdr, DFRrig - * Remarks: This is included with user programs which use RIG *---------------------------------------------------------------------------*/ -#ifndef H4_DFRIG_H -#define H4_DFRIG_H +#ifndef H4_DFRIG_PRIV_H +#define H4_DFRIG_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* description record: used to describe image data, palette data etc. */ typedef struct { @@ -64,4 +63,4 @@ typedef struct R8dim { uint16 yd; } R8dim; -#endif /* H4_DFRIG_H */ +#endif /* H4_DFRIG_PRIV_H */ diff --git a/hdf/src/dfrle.c b/hdf/src/dfrle.c index f439c68684..f9f30ca05f 100644 --- a/hdf/src/dfrle.c +++ b/hdf/src/dfrle.c @@ -21,7 +21,7 @@ * Remarks: DFCIrle() and DFCIunrle() compress and decompress RLE encoded info *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" /*----------------------------------------------------------------------------- * Name: DFCIrle diff --git a/hdf/src/dfsd.c b/hdf/src/dfsd.c index 49a9880227..0ec38935f7 100644 --- a/hdf/src/dfsd.c +++ b/hdf/src/dfsd.c @@ -18,7 +18,7 @@ Routines for input and output of numeric data group Invokes: - df.c dfgroup.c dfkit.c df.h dfsd.h + df.c dfgroup.c dfkit.c df_priv.h dfsd_priv.h Public functions: DFSDgetdims - get rank and dim sizes @@ -89,10 +89,10 @@ Fortran stub functions: This version assumes that all the values are floating point. *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfsd.h" +#include "hdf_priv.h" +#include "dfsd_priv.h" -/* MMM: make this definition correct and move to hfile.h, or wherever. */ +/* MMM: make this definition correct and move to hfile_priv.h, or wherever. */ #define DF_NOFILE 0 #define LABEL 0 diff --git a/hdf/src/dfsd.h b/hdf/src/dfsd_priv.h similarity index 97% rename from hdf/src/dfsd.h rename to hdf/src/dfsd_priv.h index e54f59271d..f86dc793b9 100644 --- a/hdf/src/dfsd.h +++ b/hdf/src/dfsd_priv.h @@ -12,9 +12,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: dfsd.h + * File: dfsd_priv.h * Purpose: header file for the Scientific Data set - * Invokes: dfrig.h + * Invokes: dfrig_priv.h * Contents: * Structure definitions: DFSsdg * Constant definitions: DFS_MAXLEN @@ -23,8 +23,8 @@ * multiple dimensions *---------------------------------------------------------------------------*/ -#ifndef H4_DFSD_H -#define H4_DFSD_H +#ifndef H4_DFSD_PRIV_H +#define H4_DFSD_PRIV_H #include "H4api_adpt.h" @@ -109,4 +109,4 @@ HDFLIBAPI int DFSDIsetdatastrs(const char *label, const char *unit, const char * } #endif -#endif /* H4_DFSD_H */ +#endif /* H4_DFSD_PRIV_H */ diff --git a/hdf/src/dfsdf.c b/hdf/src/dfsdf.c index dfb5882f4a..8c2d4a5376 100644 --- a/hdf/src/dfsdf.c +++ b/hdf/src/dfsdf.c @@ -68,8 +68,8 @@ * Remarks: no C stubs needed for the put string routines, only Fortran stubs *---------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfsd.h" +#include "hdf_priv.h" +#include "dfsd_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dfstubs.c b/hdf/src/dfstubs.c index bcb5aad99f..eb16faa585 100644 --- a/hdf/src/dfstubs.c +++ b/hdf/src/dfstubs.c @@ -40,8 +40,8 @@ ** Doug Ilg */ -#include "hdfi.h" -#include "df.h" +#include "hdf_priv.h" +#include "df_priv.h" #define DFACC_APPEND 8 #define DFEL_ABSENT 0 diff --git a/hdf/src/dfufp2i.c b/hdf/src/dfufp2i.c index 373cbf77c1..70ebc804ba 100644 --- a/hdf/src/dfufp2i.c +++ b/hdf/src/dfufp2i.c @@ -58,9 +58,9 @@ * *--------------------------------------------------------------------------*/ -#include "hdfi.h" -#include "dfufp2i.h" -#include "dfsd.h" +#include "hdf_priv.h" +#include "dfufp2i_priv.h" +#include "dfsd_priv.h" /********************************************************************** * diff --git a/hdf/src/dfufp2i.h b/hdf/src/dfufp2i_priv.h similarity index 95% rename from hdf/src/dfufp2i.h rename to hdf/src/dfufp2i_priv.h index 31a3add12d..eb74fbf522 100644 --- a/hdf/src/dfufp2i.h +++ b/hdf/src/dfufp2i_priv.h @@ -11,10 +11,10 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef H4_DFUFP2IM_H -#define H4_DFUFP2IM_H +#ifndef H4_DFUFP2I_PRIV_H +#define H4_DFUFP2I_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Input structure */ typedef struct { @@ -48,7 +48,7 @@ typedef struct { extern "C" { #endif -/* prototypes for dfufp2im.c */ +/* prototypes for dfufp2i.c */ HDFLIBAPI int process(Input *in, Output *out); HDFLIBAPI int generate_scale(int32 dim, float32 *scale); @@ -64,4 +64,4 @@ HDFLIBAPI int DFUfptoimage(int32 hdim, int32 vdim, float32 max, float32 min, flo } #endif -#endif /* H4_DFUFP2IM_H */ +#endif /* H4_DFUFP2I_PRIV_H */ diff --git a/hdf/src/dfufp2if.c b/hdf/src/dfufp2if.c index 5bfaeb5304..827b773ade 100644 --- a/hdf/src/dfufp2if.c +++ b/hdf/src/dfufp2if.c @@ -11,9 +11,9 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdfi.h" -#include "dfufp2i.h" -#include "dfsd.h" +#include "hdf_priv.h" +#include "dfufp2i_priv.h" +#include "dfsd_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dfunjpeg.c b/hdf/src/dfunjpeg.c index 799a4e19b2..e9eb2f3be8 100644 --- a/hdf/src/dfunjpeg.c +++ b/hdf/src/dfunjpeg.c @@ -23,7 +23,7 @@ * routines. *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" /* Hack to prevent libjpeg from re-defining `boolean` in a way that clashes * with windows.h. This MUST come before including jpeglib.h. diff --git a/hdf/src/dfutil.c b/hdf/src/dfutil.c index cdf1451044..7ed4aa64aa 100644 --- a/hdf/src/dfutil.c +++ b/hdf/src/dfutil.c @@ -24,7 +24,7 @@ * This version assumes that all the values are floating point. *--------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" /*----------------------------------------------------------------------------- * Name: DFfindnextref diff --git a/hdf/src/dfutilf.c b/hdf/src/dfutilf.c index 6c50c5b24c..1879abd785 100644 --- a/hdf/src/dfutilf.c +++ b/hdf/src/dfutilf.c @@ -19,7 +19,7 @@ * dfindnr_: For a given tag, find the next ref after the given ref *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/dynarray.c b/hdf/src/dynarray.c index 501d042111..03dc1c4f32 100644 --- a/hdf/src/dynarray.c +++ b/hdf/src/dynarray.c @@ -46,8 +46,8 @@ EXPORTED ROUTINES DAsize_array - Get the current dynarray size */ -#include "hdfi.h" -#include "dynarray.h" +#include "hdf_priv.h" +#include "dynarray_priv.h" typedef struct dynarray_tag { intn num_elems; /* Number of elements in the array currently */ diff --git a/hdf/src/dynarray.h b/hdf/src/dynarray_priv.h similarity index 97% rename from hdf/src/dynarray.h rename to hdf/src/dynarray_priv.h index 3353c0e9ba..633693eb15 100644 --- a/hdf/src/dynarray.h +++ b/hdf/src/dynarray_priv.h @@ -12,14 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: dynarray.h + * File: dynarray_priv.h * Purpose: header file for dynamic array API *---------------------------------------------------------------------------*/ -#ifndef H4_DYNARRAY_H -#define H4_DYNARRAY_H +#ifndef H4_DYNARRAY_PRIV_H +#define H4_DYNARRAY_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Define the pointer to the dynarray without giving outside routines access @@ -134,4 +134,4 @@ void *DAdel_elem(dynarr_p arr_ptr, /* IN: Array to access */ } #endif -#endif /* H4_DYNARRAY_H */ +#endif /* H4_DYNARRAY_PRIV_H */ diff --git a/hdf/src/glist.c b/hdf/src/glist.c index 3a79b6a9e6..f0626bcdd6 100644 --- a/hdf/src/glist.c +++ b/hdf/src/glist.c @@ -17,8 +17,8 @@ by Keith Pomakis(kppomaki@jeeves.uwaterloo.ca)-Spring, 1994 ************************************************************************/ -#include "hdfi.h" -#include "glist.h" +#include "hdf_priv.h" +#include "glist_priv.h" /*+ **************************************************************************** diff --git a/hdf/src/glist.h b/hdf/src/glist_priv.h similarity index 99% rename from hdf/src/glist.h rename to hdf/src/glist_priv.h index c6dc8dbb03..f3ccfaed25 100644 --- a/hdf/src/glist.h +++ b/hdf/src/glist_priv.h @@ -17,10 +17,10 @@ by Keith Pomakis(kppomaki@jeeves.uwaterloo.ca)-Spring, 1994 ************************************************************************/ -#ifndef H4_GLIST_H -#define H4_GLIST_H +#ifndef H4_GLIST_PRIV_H +#define H4_GLIST_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Structure for each element in the list */ typedef struct GLE_struct { @@ -659,4 +659,4 @@ void HDGLremove_all_such_that(Generic_list list, /*IN: list *******************************************************************************/ #define HDGQcopy_queue HDGLcopy_list -#endif /* H4_GLIST_H */ +#endif /* H4_GLIST_PRIV_H */ diff --git a/hdf/src/hbitio.c b/hdf/src/hbitio.c index 9a51ae1b11..1357129e01 100644 --- a/hdf/src/hbitio.c +++ b/hdf/src/hbitio.c @@ -36,8 +36,8 @@ LOCAL ROUTINES HIwrite2read - switch from writing bits to reading them */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* Local Variables */ diff --git a/hdf/src/hblocks.c b/hdf/src/hblocks.c index c4e35fc353..8b532ff7a6 100644 --- a/hdf/src/hblocks.c +++ b/hdf/src/hblocks.c @@ -118,8 +118,8 @@ LOCAL ROUTINES HLInewlink -- write out some data to a linked block */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* block_t - record of a linked block. contains the tag and ref of the data elt that forms the linked block */ diff --git a/hdf/src/hbuffer.c b/hdf/src/hbuffer.c index eaa5df5c78..ee9a23e378 100644 --- a/hdf/src/hbuffer.c +++ b/hdf/src/hbuffer.c @@ -45,8 +45,8 @@ EXPORTED ROUTINES ------------------------------------------------------------------------- */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* extinfo_t -- external elt information structure */ diff --git a/hdf/src/hchunks.c b/hdf/src/hchunks.c index 8d7f736b1a..eb6f7239b9 100644 --- a/hdf/src/hchunks.c +++ b/hdf/src/hchunks.c @@ -253,13 +253,13 @@ LOCAL ROUTINES #define STATISTICS */ -#include "hdfi.h" -#include "hfile.h" -#include "mcache.h" -#include "hchunks.h" +#include "hdf_priv.h" +#include "hfile_priv.h" +#include "mcache_priv.h" +#include "hchunks_priv.h" -#include "tbbt.h" -#include "mcache.h" +#include "tbbt_priv.h" +#include "mcache_priv.h" #include "hcomp.h" /* Define class, class version and name(partial) for chunk table i.e. Vdata */ @@ -348,7 +348,7 @@ typedef struct chunkinfo_t { /* private functions */ static int32 HMCIstaccess(accrec_t *access_rec, /* IN: access record to fill in */ int16 acc_mode /* IN: access mode */); -/* tbbt.h helper routines */ +/* tbbt_priv.h helper routines */ static intn chkcompare(void *k1, /* IN: first key */ void *k2, /* IN: second key */ intn cmparg /* IN: not sure? */); diff --git a/hdf/src/hchunks.h b/hdf/src/hchunks_priv.h similarity index 96% rename from hdf/src/hchunks.h rename to hdf/src/hchunks_priv.h index f59b97318c..314b5b5919 100644 --- a/hdf/src/hchunks.h +++ b/hdf/src/hchunks_priv.h @@ -12,18 +12,18 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: hchunks.h + * File: hchunks_priv.h * Purpose: Header file for Chunked elements * Dependencies: tbbt.c mcache.c * Contents: Structures & definitions for chunked elements * Structure definitions: DIM_DEF, HCHUNK_DEF *---------------------------------------------------------------------------*/ -#ifndef H4_HCHUNKS_H -#define H4_HCHUNKS_H +#ifndef H4_HCHUNKS_PRIV_H +#define H4_HCHUNKS_PRIV_H -#include "hdfi.h" -#include "hfile.h" /* special info stuff */ +#include "hdf_priv.h" +#include "hfile_priv.h" /* special info stuff */ /* Public structures */ @@ -112,4 +112,4 @@ HDFLIBAPI int32 HMCPgetnumrecs /* has to be here because used in hfile.c */ } #endif -#endif /* H4_HCHUNKS_H */ +#endif /* H4_HCHUNKS_PRIV_H */ diff --git a/hdf/src/hcomp.c b/hdf/src/hcomp.c index 64b74d4bb1..4593caa349 100644 --- a/hdf/src/hcomp.c +++ b/hdf/src/hcomp.c @@ -63,14 +63,14 @@ EXPORTED ROUTINES */ /* General HDF includes */ -#include "hdfi.h" +#include "hdf_priv.h" #ifdef H4_HAVE_LIBSZ #include "szlib.h" #endif /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ /* Local defines */ #define COMP_HEADER_VERSION 0 diff --git a/hdf/src/hcompi.h b/hdf/src/hcomp_priv.h similarity index 88% rename from hdf/src/hcompi.h rename to hdf/src/hcomp_priv.h index f1971e19c5..d480e5af4e 100644 --- a/hdf/src/hcompi.h +++ b/hdf/src/hcomp_priv.h @@ -12,7 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: hcompi.h + * File: hcomp_priv.h * Purpose: Internal library header file for compression information * Dependencies: should be included after hdf.h * Invokes: @@ -21,18 +21,18 @@ * Constant definitions: *---------------------------------------------------------------------------*/ -#ifndef H4_HCOMPI_H -#define H4_HCOMPI_H +#ifndef H4_HCOMP_PRIV_H +#define H4_HCOMP_PRIV_H -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* Modeling information */ /* structure for storing modeling information */ /* only allow modeling and master compression routines access */ -#include "mstdio.h" /* stdio modeling header */ +#include "mstdio_priv.h" /* stdio modeling header */ typedef struct comp_model_info_tag { comp_model_t model_type; /* model this stream is using */ @@ -47,12 +47,12 @@ typedef struct comp_model_info_tag { /* structure for storing modeling information */ /* only allow encoding and master compression routines access */ -#include "cnone.h" /* no encoding header */ -#include "crle.h" /* run-length encoding header */ -#include "cnbit.h" /* N-bit encoding header */ -#include "cskphuff.h" /* Skipping huffman encoding header */ -#include "cdeflate.h" /* gzip 'deflate' encoding header */ -#include "cszip.h" /* szip encoding header */ +#include "cnone_priv.h" /* no encoding header */ +#include "crle_priv.h" /* run-length encoding header */ +#include "cnbit_priv.h" /* N-bit encoding header */ +#include "cskphuff_priv.h" /* Skipping huffman encoding header */ +#include "cdeflate_priv.h" /* gzip 'deflate' encoding header */ +#include "cszip_priv.h" /* szip encoding header */ typedef struct comp_coder_info_tag { comp_coder_t coder_type; /* coding scheme this stream is using */ @@ -96,4 +96,4 @@ typedef struct compinfo_tag { comp_state_cache_t sinfo; /* state information for caching */ } compinfo_t; -#endif /* H4_HCOMPI_H */ +#endif /* H4_HCOMP_PRIV_H */ diff --git a/hdf/src/hcompri.c b/hdf/src/hcompri.c index 936d001f12..72783f8564 100644 --- a/hdf/src/hcompri.c +++ b/hdf/src/hcompri.c @@ -44,8 +44,8 @@ ------------------------------------------------------------------------- */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* crinfo_t -- compressed raster information structure */ diff --git a/hdf/src/hconv.h b/hdf/src/hconv_priv.h similarity index 96% rename from hdf/src/hconv.h rename to hdf/src/hconv_priv.h index 44de2d782b..0153f508fa 100644 --- a/hdf/src/hconv.h +++ b/hdf/src/hconv_priv.h @@ -12,14 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: hconv.h + * File: hconv_priv.h * Purpose: header file for data conversion information & structures *---------------------------------------------------------------------------*/ -#ifndef H4_HCONV_H -#define H4_HCONV_H +#ifndef H4_HCONV_PRIV_H +#define H4_HCONV_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /*****************************************************************************/ /* CONSTANT DEFINITIONS */ @@ -122,4 +122,4 @@ union float_uint_uchar { unsigned char c[4]; }; -#endif /* H4_HCONV_H */ +#endif /* H4_HCONV_PRIV_H */ diff --git a/hdf/src/hdatainfo.c b/hdf/src/hdatainfo.c index 00f49bca7a..b9c44619fd 100644 --- a/hdf/src/hdatainfo.c +++ b/hdf/src/hdatainfo.c @@ -44,12 +44,13 @@ LOW-LEVEL ROUTINES **********************************************************************/ -#include "hdfi.h" -#include "hlimits.h" -#include "vgint.h" -#include "mfani.h" +#include "hdf_priv.h" + #include "mfan.h" -#include "mfgri.h" + +#include "vg_priv.h" +#include "mfan_priv.h" +#include "mfgr_priv.h" #ifdef H4_HAVE_LIBSZ /* we have the szip library */ #include "szlib.h" diff --git a/hdf/src/hdfi.h b/hdf/src/hdf_priv.h similarity index 99% rename from hdf/src/hdfi.h rename to hdf/src/hdf_priv.h index d4afe68ad3..ebbb9e47c6 100644 --- a/hdf/src/hdfi.h +++ b/hdf/src/hdf_priv.h @@ -11,8 +11,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef H4_HDFI_H -#define H4_HDFI_H +#ifndef H4_HDF_PRIV_H +#define H4_HDF_PRIV_H /* Define the I/O scheme before hdf.h to avoid an ordering mess in the * vconv.c code @@ -261,4 +261,4 @@ typedef intptr_t hdf_pint_t; */ #define JMEMSYS MEM_ANSI -#endif /* H4_HDFI_H */ +#endif /* H4_HDF_PRIV_H */ diff --git a/hdf/src/hdfalloc.c b/hdf/src/hdfalloc.c index 81dee7778d..8c2dd11b03 100644 --- a/hdf/src/hdfalloc.c +++ b/hdf/src/hdfalloc.c @@ -11,7 +11,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdfi.h" +#include "hdf_priv.h" /* LOCAL ROUTINES diff --git a/hdf/src/herr.c b/hdf/src/herr.c index 7149bd6afa..a6c41b6801 100644 --- a/hdf/src/herr.c +++ b/hdf/src/herr.c @@ -26,7 +26,7 @@ EXPORTED ROUTINES HEvalue -- return a error off of the error stack */ -#include "hdfi.h" +#include "hdf_priv.h" /* ** Include files for variable argument processing for HEreport diff --git a/hdf/src/herrf.c b/hdf/src/herrf.c index fbb023bdc4..769fca26cf 100644 --- a/hdf/src/herrf.c +++ b/hdf/src/herrf.c @@ -20,7 +20,7 @@ * Remarks: none *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/hextelt.c b/hdf/src/hextelt.c index 35a07874eb..4382c1aea3 100644 --- a/hdf/src/hextelt.c +++ b/hdf/src/hextelt.c @@ -74,8 +74,8 @@ EXPORTED ROUTINES ------------------------------------------------------------------------- */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* Directory separator definitions relating to a path. * Note this does not provide a universal way to recognize diff --git a/hdf/src/hfile.c b/hdf/src/hfile.c index 21ef511d35..8008526704 100644 --- a/hdf/src/hfile.c +++ b/hdf/src/hfile.c @@ -18,7 +18,7 @@ H-Level Limits ============== - o MAX_ACC access records open at a single time (#define in hfile.h) + o MAX_ACC access records open at a single time (#define in hfile_priv.h) o int16 total tags (fixed) o int32 max length and offset of an element in an HDF file (fixed) @@ -112,9 +112,9 @@ #include -#include "hdfi.h" -#include "hfile.h" -#include "glist.h" /* for double-linked lists, stacks and queues */ +#include "hdf_priv.h" +#include "hfile_priv.h" +#include "glist_priv.h" /* for double-linked lists, stacks and queues */ /*--------------------- Locally defined Globals -----------------------------*/ @@ -155,7 +155,7 @@ extern funclist_t comp_funcs; /* Functions for accessing chunked data elements. For definition of the chunked data element, see hchunk.c. */ -#include "hchunks.h" +#include "hchunks_priv.h" /* Functions for accessing buffered data elements. For definition of the buffered data element, see hbuffer.c. */ @@ -2438,7 +2438,7 @@ HDbase_tag(uint16 tag) RETURNS returns SUCCEED (0). DESCRIPTION - Copies values from #defines in hfile.h to provided buffers. This + Copies values from #defines in hfile_priv.h to provided buffers. This information is statistically compiled into the HDF library, so it is not necessary to have any files open to get this information. diff --git a/hdf/src/hfile.h b/hdf/src/hfile_priv.h similarity index 98% rename from hdf/src/hfile.h rename to hdf/src/hfile_priv.h index 447c31ab44..370e60098c 100644 --- a/hdf/src/hfile.h +++ b/hdf/src/hfile_priv.h @@ -11,20 +11,20 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/*+ hfile.h - *** Header for hfile.c, routines for low level data element I/O - + */ +/* hfile_priv.h + * Header for hfile.c, routines for low level data element I/O + */ -#ifndef H4_HFILE_H -#define H4_HFILE_H +#ifndef H4_HFILE_PRIV_H +#define H4_HFILE_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" -#include "tbbt.h" -#include "bitvect.h" -#include "atom.h" -#include "linklist.h" -#include "dynarray.h" +#include "tbbt_priv.h" +#include "bitvect_priv.h" +#include "atom_priv.h" +#include "linklist_priv.h" +#include "dynarray_priv.h" /* Magic cookie for HDF data files */ #define MAGICLEN 4 /* length */ @@ -57,10 +57,10 @@ #define LIBVER_MAJOR 4 #define LIBVER_MINOR 3 #define LIBVER_RELEASE 0 -#define LIBVER_SUBRELEASE "1" /* For pre-releases like snap0 */ - /* Empty string for real releases. */ +#define LIBVER_SUBRELEASE "1" /* For pre-releases like snap0 */ + /* Empty string for real releases */ #define LIBVER_STRING "HDF Version 4.3 Release 0-1, February 5, 2024" -#define LIBVSTR_LEN 80 /* length of version string */ +#define LIBVSTR_LEN 80 /* Length of version string */ #define LIBVER_LEN 92 /* 4+4+4+80 = 92 */ /* end of version tags */ @@ -532,9 +532,9 @@ HDFLIBAPI int32 HCPinfo(accrec_t *access_rec, sp_info_block_t *info_block); HDFLIBAPI int32 get_comp_len(accrec_t *access_rec); /* - ** from hchunks.c - should be the same as found in 'hchunks.h' + ** from hchunks.c - should be the same as found in 'hchunks_priv.h' */ -#include "hchunks.h" +#include "hchunks_priv.h" /* ** from hbuffer.c @@ -789,4 +789,4 @@ intn HTPdump_dds(int32 file_id, /* IN: file ID of HDF file to dump info for */ } #endif -#endif /* H4_HFILE_H */ +#endif /* H4_HFILE_PRIV_H */ diff --git a/hdf/src/hfiledd.c b/hdf/src/hfiledd.c index 5a222ead01..f89a2063ac 100644 --- a/hdf/src/hfiledd.c +++ b/hdf/src/hfiledd.c @@ -84,8 +84,8 @@ OLD ROUTINES HIunregister_tag_ref - mark a ref as un-used for a tag */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* Private routines */ static intn HTIfind_dd(filerec_t *file_rec, uint16 look_tag, uint16 look_ref, dd_t **pdd, intn direction); diff --git a/hdf/src/hfilef.c b/hdf/src/hfilef.c index 3f287bf9eb..a0cbad8ce3 100644 --- a/hdf/src/hfilef.c +++ b/hdf/src/hfilef.c @@ -20,7 +20,7 @@ * hclose_: call Hclose to close HDF file *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/hkit.c b/hdf/src/hkit.c index bf449c7db7..c7fb3da2ac 100644 --- a/hdf/src/hkit.c +++ b/hdf/src/hkit.c @@ -11,8 +11,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdfi.h" -#include "hkit.h" +#include "hdf_priv.h" +#include "hkit_priv.h" /* LOCAL ROUTINES diff --git a/hdf/src/hkit.h b/hdf/src/hkit_priv.h similarity index 97% rename from hdf/src/hkit.h rename to hdf/src/hkit_priv.h index e557d03dbc..8d834b408f 100644 --- a/hdf/src/hkit.h +++ b/hdf/src/hkit_priv.h @@ -11,15 +11,16 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/*+ hkit.h - *** private header file for hkit routines - + */ +/* hkit_priv.h + * + * private header file for hkit routines + */ -#ifndef H4_HKIT_H -#define H4_HKIT_H +#ifndef H4_HKIT_PRIV_H +#define H4_HKIT_PRIV_H -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* tag_messages is the list of tag descriptions in the system, kept as tag-description pairs. To look up a description, a linear search is @@ -158,4 +159,4 @@ static const nt_descript_t nt_descriptions[] = { }; -#endif /* H4_HKIT_H */ +#endif /* H4_HKIT_PRIV_H */ diff --git a/hdf/src/hlimits.h b/hdf/src/hlimits.h index 8873ee4f21..fb7ec30b29 100644 --- a/hdf/src/hlimits.h +++ b/hdf/src/hlimits.h @@ -30,7 +30,7 @@ /************************************************************************** * Generally useful macro definitions - * (These are copied from hdfi.h and should remain included in both files + * (These are copied from hdf_priv.h and should remain included in both files * because hlimits.h is included from netcdf.h which is used in some * netCDF utilities which don't need or want the rest of the HDF header * files. -QAK - 2/17/99 ) @@ -224,7 +224,7 @@ changing the class name variable declaration much easier - BMR 4/1/02*/ * _HDF_ATTRIBUTE "Attr0.0" 8/1/96 */ /* classes of the Vdatas/Vgroups created by the SD interface, - from local_nc.h */ + from nc_priv.h */ #define _HDF_ATTRIBUTE "Attr0.0" /* class of a Vdata containing SD interface attribute */ #define _HDF_VARIABLE "Var0.0" @@ -250,7 +250,7 @@ changing the class name variable declaration much easier - BMR 4/1/02*/ #define ATTR_FIELD_NAME "VALUES" /* The following vdata class name is reserved by the Chunking interface. - originally defined in 'hchunks.h'. The full class name + originally defined in 'hchunks_priv.h'. The full class name currently is "_HDF_CHK_TBL_0". -GV 9/25/97 Made the vdata class name available to other interfaces since it is needed diff --git a/hdf/src/hproto_fortran.h b/hdf/src/hproto_fortran.h index 669ca600e3..4c94aa35c4 100644 --- a/hdf/src/hproto_fortran.h +++ b/hdf/src/hproto_fortran.h @@ -15,7 +15,7 @@ #define H4_H_PROTO_FORTRAN #include "H4api_adpt.h" -#include "df.h" +#include "df_priv.h" #ifdef __cplusplus extern "C" { @@ -536,7 +536,7 @@ HDFFCLIBAPI intf nhinumbr(int32 file_id, uint16 tag); HDFFCLIBAPI intf nhconfinfc(intf *coder_type, intf *info); /* - ** from dfufp2im.c + ** from dfufp2i.c */ #define nduif2i H4_F77_FUNC(duif2i, DUIF2I) diff --git a/hdf/src/hqueue.h b/hdf/src/hqueue_priv.h similarity index 98% rename from hdf/src/hqueue.h rename to hdf/src/hqueue_priv.h index 5f7d24ebd0..f1470250f0 100644 --- a/hdf/src/hqueue.h +++ b/hdf/src/hqueue_priv.h @@ -30,15 +30,15 @@ */ /***************************************************************************** - * File: hqueue.h + * File: hqueue_priv.h * * This is a modffied version of the original Berkeley code for * manipulating a memory pool. This version however is not * compatible with the original Berkeley version. *****************************************************************************/ -#ifndef H4_HQUEUE_H -#define H4_HQUEUE_H +#ifndef H4_HQUEUE_PRIV_H +#define H4_HQUEUE_PRIV_H /* * This file defines three types of data structures: lists, tail queues, @@ -152,4 +152,4 @@ else \ (elm)->field.cqe_prev->field.cqe_next = (elm)->field.cqe_next; \ } -#endif /* H4_HQUEUE_H */ +#endif /* H4_HQUEUE_PRIV_H */ diff --git a/hdf/src/linklist.c b/hdf/src/linklist.c index 5180e16460..60334d45c1 100644 --- a/hdf/src/linklist.c +++ b/hdf/src/linklist.c @@ -28,8 +28,6 @@ DESIGN a pointer to a managed object. The list may be sorted or unsorted, based on the comparison function. -BUGS/LIMITATIONS - LOCAL ROUTINES HULIget_list_node - Gets a list node HULIrelease_list_node - Releases a list node @@ -44,8 +42,8 @@ EXPORTED ROUTINES HULshutdown - Close down the HUL interface */ -#include "hdfi.h" -#include "linklist.h" +#include "hdf_priv.h" +#include "linklist_priv.h" /* Pointer to the list node free list */ static node_info_t *node_free_list = NULL; diff --git a/hdf/src/linklist.h b/hdf/src/linklist_priv.h similarity index 98% rename from hdf/src/linklist.h rename to hdf/src/linklist_priv.h index d7cbfd9c54..895d3a8f6a 100644 --- a/hdf/src/linklist.h +++ b/hdf/src/linklist_priv.h @@ -12,14 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: linklist.h + * File: linklist_priv.h * Purpose: header file for linked list API *---------------------------------------------------------------------------*/ -#ifndef H4_LINKLIST_H -#define H4_LINKLIST_H +#ifndef H4_LINKLIST_PRIV_H +#define H4_LINKLIST_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* Definitions for linked-list creation flags */ #define HUL_UNSORTED_LIST 0x0000 @@ -184,4 +184,4 @@ intn HULshutdown(void); } #endif -#endif /* H4_LINKLIST_H */ +#endif /* H4_LINKLIST_PRIV_H */ diff --git a/hdf/src/mcache.c b/hdf/src/mcache.c index fd8fc543cc..338e63a811 100644 --- a/hdf/src/mcache.c +++ b/hdf/src/mcache.c @@ -49,9 +49,9 @@ #define STATISTICS */ -#include "hdfi.h" -#include "hqueue.h" -#include "mcache.h" +#include "hdf_priv.h" +#include "hqueue_priv.h" +#include "mcache_priv.h" /* Private routines */ static BKT *mcache_bkt(MCACHE *mp); diff --git a/hdf/src/mcache.h b/hdf/src/mcache_priv.h similarity index 97% rename from hdf/src/mcache.h rename to hdf/src/mcache_priv.h index cd5d0114ce..582770bffc 100644 --- a/hdf/src/mcache.h +++ b/hdf/src/mcache_priv.h @@ -29,7 +29,7 @@ */ /***************************************************************************** - * File: mcache.h + * File: mcache_priv.h * * This is a modified version of the original Berkeley code for * manipulating a memory pool. This version however is not @@ -46,11 +46,11 @@ * -georgev */ -#ifndef H4_MCACHE_H -#define H4_MCACHE_H +#ifndef H4_MCACHE_PRIV_H +#define H4_MCACHE_PRIV_H -#include "hdfi.h" -#include "hqueue.h" /* Circular queue functions(Macros) */ +#include "hdf_priv.h" +#include "hqueue_priv.h" /* Circular queue functions(Macros) */ /* Set return/succeed values */ #ifdef SUCCEED @@ -188,4 +188,4 @@ HDFLIBAPI void mcache_stat(MCACHE *mp /* IN: MCACHE cookie */); } #endif -#endif /* H4_MCACHE_H */ +#endif /* H4_MCACHE_PRIV_H */ diff --git a/hdf/src/mfan.c b/hdf/src/mfan.c index 5901599470..1a1129c9eb 100644 --- a/hdf/src/mfan.c +++ b/hdf/src/mfan.c @@ -78,12 +78,12 @@ * *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" -#include "mfani.h" +#include "mfan_priv.h" #include "mfan.h" -#include "atom.h" -#include "hfile.h" /* needed for filerec_t */ +#include "atom_priv.h" +#include "hfile_priv.h" /* needed for filerec_t */ /* Whether we've installed the library termination function yet for this interface */ diff --git a/hdf/src/mfan.h b/hdf/src/mfan.h index cb8cdee532..9d9b3925d0 100644 --- a/hdf/src/mfan.h +++ b/hdf/src/mfan.h @@ -19,7 +19,7 @@ #ifndef H4_MFAN_H #define H4_MFAN_H -#include "hdfi.h" +#include "hdf.h" #ifdef __cplusplus extern "C" { diff --git a/hdf/src/mfani.h b/hdf/src/mfan_priv.h similarity index 95% rename from hdf/src/mfani.h rename to hdf/src/mfan_priv.h index 40b90592cd..0c6b9c8dbe 100644 --- a/hdf/src/mfani.h +++ b/hdf/src/mfan_priv.h @@ -12,14 +12,14 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*------------------------------------------------------------------------------ - * File: mfani.h + * File: mfan_priv.h * Purpose: private header file for the Multi-file Annotation Interface *----------------------------------------------------------------------------*/ -#ifndef H4_MFANI_H -#define H4_MFANI_H +#ifndef H4_MFAN_PRIV_H +#define H4_MFAN_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* This structure is used to find which file the annotation belongs to * and use the subsequent file specific annotation 'key' to find the @@ -62,4 +62,4 @@ typedef struct ANentry { /* Obtain Annotation type from key */ #define AN_KEY2TYPE(k) ((int32)((int32)k >> 16)) -#endif /* H4_MFANI_H */ +#endif /* H4_MFAN_PRIV_H */ diff --git a/hdf/src/mfanf.c b/hdf/src/mfanf.c index 25ca8f6f0a..d3c2e25796 100644 --- a/hdf/src/mfanf.c +++ b/hdf/src/mfanf.c @@ -47,7 +47,7 @@ * aftagatype - annotation TAG to corresponding annotation type *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /*----------------------------------------------------------------------------- diff --git a/hdf/src/mfgr.c b/hdf/src/mfgr.c index e8173c62cc..64c0670d4d 100644 --- a/hdf/src/mfgr.c +++ b/hdf/src/mfgr.c @@ -154,9 +154,8 @@ intn GRIil_convert(const void * inbuf,gr_interlace_t inil,void * outbuf, - Copy a pixel buffer from one interlace to another. */ -#include "hdfi.h" -#include "hlimits.h" -#include "mfgri.h" +#include "hdf_priv.h" +#include "mfgr_priv.h" #ifdef H4_HAVE_LIBSZ /* we have the library */ #include "szlib.h" diff --git a/hdf/src/mfgri.h b/hdf/src/mfgr_priv.h similarity index 97% rename from hdf/src/mfgri.h rename to hdf/src/mfgr_priv.h index 6e6f5dc80b..7e3f5e1f37 100644 --- a/hdf/src/mfgri.h +++ b/hdf/src/mfgr_priv.h @@ -12,17 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: mfgri.h + * File: mfgr_priv.h * Purpose: private header file for multi-file general raster information *---------------------------------------------------------------------------*/ -#ifndef H4_MFGRI_H -#define H4_MFGRI_H +#ifndef H4_MFGR_PRIV_H +#define H4_MFGR_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" -#include "hfile.h" -#include "tbbt.h" +#include "hfile_priv.h" +#include "tbbt_priv.h" /* This is the size of the hash tables used for GR & RI IDs */ #define GRATOM_HASH_SIZE 32 @@ -135,4 +135,4 @@ HDFLIBAPI void GRIridestroynode(void *n); } #endif -#endif /* H4_MFGRI_H */ +#endif /* H4_MFGR_PRIV_H */ diff --git a/hdf/src/mfgrf.c b/hdf/src/mfgrf.c index f47996a2a4..aee08b74c6 100644 --- a/hdf/src/mfgrf.c +++ b/hdf/src/mfgrf.c @@ -54,7 +54,7 @@ * by palette identifier *---------------------------------------------------------------------------*/ -#include "hdfi.h" +#include "hdf_priv.h" #include "hproto_fortran.h" /* Local pre-processor macros */ diff --git a/hdf/src/mstdio.c b/hdf/src/mstdio.c index 4ff60da112..f9577f65d4 100644 --- a/hdf/src/mstdio.c +++ b/hdf/src/mstdio.c @@ -12,9 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* -FILE - mstdio.c - HDF stdio-like modeling I/O routines + mstdio.c - HDF stdio-like modeling I/O routines REMARKS Basically a NOP interface, it just calls the encoding layer. @@ -39,11 +37,11 @@ EXPORTED ROUTINES */ /* General HDF includes */ -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* HDF compression includes */ -#include "hcompi.h" /* Internal definitions for compression */ +#include "hcomp_priv.h" /* Internal definitions for compression */ funclist_t mstdio_funcs = {HCPmstdio_stread, HCPmstdio_stwrite, diff --git a/hdf/src/mstdio.h b/hdf/src/mstdio_priv.h similarity index 94% rename from hdf/src/mstdio.h rename to hdf/src/mstdio_priv.h index 35a90eca25..784bc72a74 100644 --- a/hdf/src/mstdio.h +++ b/hdf/src/mstdio_priv.h @@ -12,17 +12,17 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /*----------------------------------------------------------------------------- - * File: mstdio.h + * File: mstdio_priv.h * Purpose: Header file for stdio-like modeling information. * Dependencies: should be included after hdf.h * Contents: Structures & definitions for stdio modeling. This header * should only be included in hcomp.c and mstdio.c. *---------------------------------------------------------------------------*/ -#ifndef H4_MSTDIO_H -#define H4_MSTDIO_H +#ifndef H4_MSTDIO_PRIV_H +#define H4_MSTDIO_PRIV_H -#include "hdfi.h" +#include "hdf_priv.h" /* model information about stdio model */ typedef struct { @@ -59,4 +59,4 @@ HDFLIBAPI intn HCPmstdio_endaccess(accrec_t *access_rec); } #endif -#endif /* H4_MSTDIO_H */ +#endif /* H4_MSTDIO_PRIV_H */ diff --git a/hdf/src/src.inc b/hdf/src/src.inc deleted file mode 100644 index 50f0b8930f..0000000000 --- a/hdf/src/src.inc +++ /dev/null @@ -1,136 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF. The full HDF copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -# -# ################################################################## -# -# Part of MAKEFILE for creating the HDF library, libdf.a, -# -# This file contains the definitions of all the source code and headers -# used in the actual makefile. They are located here for ease of maintenance. -# -# ################################################################## -# -# - -# Header files not included for copying to 'include' directory during installation -# These are private to the library and users do need them -HDRS_NO= glist.h mcache.h hqueue.h - -HDRS=$(H_HDRS) $(DF_HDRS) $(DFAN_HDRS) $(DFRI_HDRS) $(DFSD_HDRS) $(V_HDRS) \ - $(MFAN_HDRS) $(MFGR_HDRS) - -H_HDRS=hfile.h hdf.h hdfi.h herr.h hproto.h hcomp.h hconv.h hbitio.h \ - tbbt.h crle.h cnbit.h mstdio.h cnone.h cskphuff.h cdeflate.h \ - hlimits.h hntdefs.h htags.h hkit.h hcompi.h bitvect.h atom.h \ - dynarray.h linklist.h hchunks.h cszip.h - -DF_HDRS=df.h dfufp2i.h -DFAN_HDRS=dfan.h -DFRI_HDRS=dfrig.h dfgr.h -DFSD_HDRS=dfsd.h -V_HDRS=vg.h -MFAN_HDRS=mfan.h -MFGR_HDRS=mfgr.h - -CSRCS = $(HCSRCS) $(VCSRCS) $(DFCSRCS) $(MFCSRCS) -HCSRCS=hfile.c herr.c hblocks.c hbuffer.c hcompri.c hextelt.c hkit.c hdfalloc.c \ - hcomp.c hbitio.c tbbt.c hdfalloc.c hcomp.c crle.c cnbit.c mstdio.c cnone.c \ - cskphuff.c cdeflate.c bitvect.c atom.c hfiledd.c dynarray.c linklist.c \ - glist.c hchunks.c mcache.c cszip.c - -VCSRCS=vg.c vrw.c vio.c vparse.c vconv.c vsfld.c vgp.c vhi.c vattr.c - -DFCSRCS=$(DFG_CSRCS) $(DFAN_CSRCS) $(DFSD_CSRCS) $(DFRI_CSRCS) -DFG_CSRCS=dfgroup.c dfconv.c dfufp2i.c dfutil.c dfstubs.c dfknat.c dfkswap.c \ - dfkcray.c dfkvms.c dfkconv.c dfkfuji.c -DFAN_CSRCS=dfan.c -DFSD_CSRCS=dfsd.c -DFRI_CSRCS=dfr8.c dfcomp.c dfrle.c dfimcomp.c dfjpeg.c dfunjpeg.c dfp.c \ - dfgr.c df24.c - -MFCSRCS= $(MFAN_CSRCS) $(MFGR_CSRCS) -MFAN_CSRCS=mfan.c -MFGR_CSRCS=mfgr.c - -COBJS = $(HCOBJS) $(VCOBJS) $(DFCOBJS) $(MFCOBJS) -HCOBJS=hfile.o herr.o hblocks.o hbuffer.o hcompri.o hextelt.o hkit.o hdfalloc.o \ - hcomp.o hbitio.o tbbt.o crle.o cnbit.o mstdio.o cnone.o cskphuff.o \ - cdeflate.o bitvect.o atom.o hfiledd.o dynarray.o linklist.o glist.o \ - hchunks.o mcache.o cszip.o - -VCOBJS=vg.o vrw.o vio.o vparse.o vconv.o vsfld.o vgp.o vhi.o vattr.o - -DFCOBJS=$(DFG_COBJS) $(DFAN_COBJS) $(DFSD_COBJS) $(DFRI_COBJS) -DFG_COBJS=dfgroup.o dfconv.o dfufp2i.o dfutil.o dfstubs.o dfknat.o dfkswap.o \ - dfkcray.o dfkvms.o dfkconv.o dfkfuji.o -DFAN_COBJS=dfan.o -DFSD_COBJS=dfsd.o -DFRI_COBJS=dfr8.o dfcomp.o dfrle.o dfimcomp.o dfjpeg.o dfunjpeg.o dfp.o \ - dfgr.o df24.o - -MFCOBJS= $(MFAN_COBJS) $(MFGR_COBJS) -MFAN_COBJS=mfan.o -MFGR_COBJS=mfgr.o - -FSRCS = $(FCSRCS) $(FFSRCS) -FCSRCS=$(H_FCSRCS) $(V_FCSRCS) $(DF_FCSRCS) $(DFAN_FCSRCS) $(DFSD_FCSRCS) \ - $(DFRI_FCSRCS) $(MFAN_FCSRCS) $(MFGR_FCSRCS) -H_FCSRCS=hfilef.c herrf.c -V_FCSRCS=vgf.c vattrf.c -DF_FCSRCS=dff.c dfutilf.c -DFAN_FCSRCS=dfanf.c -DFSD_FCSRCS=dfsdf.c -DFRI_FCSRCS=dfr8f.c dfpf.c df24f.c -MFAN_FCSRCS=mfanf.c -MFGR_FCSRCS=mfgrf.c - -FFSRCS=$(H_FFSRCS) $(V_FFSRCS) $(DF_FFSRCS) $(DFAN_FFSRCS) $(DFSD_FFSRCS) \ - $(DFRI_FFSRCS) $(MFAN_FFSRCS) $(MFGR_FFSRCS) -H_FFSRCS=hfileff.f -V_FFSRCS=vgff.f vattrff.f -DF_FFSRCS=dfff.f dfufp2if.f -DFAN_FFSRCS=dfanff.f -DFSD_FFSRCS=dfsdff.f -DFRI_FFSRCS=df24ff.f dfpff.f dfr8ff.f -MFAN_FFSRCS= -MFGR_FFSRCS=mfgrff.f - -FOBJS = $(FCOBJS) $(FFOBJS) - -FCOBJS=$(H_FCOBJS) $(V_FCOBJS) $(DF_FCOBJS) $(DFAN_FCOBJS) $(DFSD_FCOBJS) \ - $(DFRI_FCOBJS) $(MFAN_FCOBJS) $(MFGR_FCOBJS) -H_FCOBJS=hfilef.o herrf.o -V_FCOBJS=vgf.o vattrf.o -DF_FCOBJS=dff.o dfutilf.o -DFAN_FCOBJS=dfanf.o -DFSD_FCOBJS=dfsdf.o -DFRI_FCOBJS=dfr8f.o dfpf.o df24f.o -MFAN_FCOBJS=mfanf.o -MFGR_FCOBJS=mfgrf.o - -FFOBJS=$(H_FFOBJS) $(V_FFOBJS) $(DF_FFOBJS) $(DFAN_FFOBJS) $(DFSD_FFOBJS) \ - $(DFRI_FFOBJS) $(MFAN_FFOBJS) $(MFGR_FFOBJS) -H_FFOBJS=hfileff.o -V_FFOBJS=vgff.o vattrff.o -DF_FFOBJS=dfff.o dfufp2if.o -DFAN_FFOBJS=dfanff.o -DFSD_FFOBJS=dfsdff.o -DFRI_FFOBJS=df24ff.o dfpff.o dfr8ff.o -MFAN_FFOBJS= -MFGR_FFOBJS=mfgrff.o - -F90INCS=dffunc.f90 hdf.f90 -FINCS=dffunc.inc hdf.inc $(F90INCS) - - diff --git a/hdf/src/tbbt.c b/hdf/src/tbbt.c index 1eceb5ac2d..d62b5c43e5 100644 --- a/hdf/src/tbbt.c +++ b/hdf/src/tbbt.c @@ -15,8 +15,8 @@ /* Extended from (added threads to) Knuth 6.2.3, Algorithm A (AVL trees) */ /* Basic tree structure by Adel'son-Vel'skii and Landis */ -#include "hdfi.h" -#include "tbbt.h" +#include "hdf_priv.h" +#include "tbbt_priv.h" #define PARENT 0 #define LEFT 1 diff --git a/hdf/src/tbbt.h b/hdf/src/tbbt_priv.h similarity index 97% rename from hdf/src/tbbt.h rename to hdf/src/tbbt_priv.h index b9edc0355a..4b62493088 100644 --- a/hdf/src/tbbt.h +++ b/hdf/src/tbbt_priv.h @@ -11,13 +11,13 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* "tbbt.h" -- Data types/routines for threaded, balanced, binary trees. */ +/* "tbbt_priv.h" -- Data types/routines for threaded, balanced, binary trees. */ /* Extended from Knuth 6.2.3, Algorithm A */ #ifndef H4_TBBT_H #define H4_TBBT_H -#include "hdfi.h" +#include "hdf_priv.h" /* Define the "fast compare" values */ #define TBBT_FAST_UINT16_COMPARE 1 @@ -75,8 +75,10 @@ typedef struct tbbt_tree { * each node will be set equal to the pointer to the data item. * * Since the "data item" pointer is the first field of each tree node, these - * routines may be used without this "tbbt.h" file. For example, assume "ITM" - * is the structure definition for the data items you want to store in lists: + * routines may be used without this "tbbt_priv.h" file. For example, assume + * "ITM" is the structure definition for the data items you want to store in + * lists: + * * ITM ***tbbtdmake( int (*cmp)(void *,void *,int), int arg ); * ITM **root= NULL; (* How to create an empty tree w/o tbbtdmake() *) * ITM **tbbtdfind( ITM ***tree, void *key, ITM ***pp ); diff --git a/hdf/src/vattr.c b/hdf/src/vattr.c index edc6be1c93..11f2fb9cca 100644 --- a/hdf/src/vattr.c +++ b/hdf/src/vattr.c @@ -11,8 +11,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /************************************************************** * diff --git a/hdf/src/vattrf.c b/hdf/src/vattrf.c index 0e6cb7ae9c..ce09d79011 100644 --- a/hdf/src/vattrf.c +++ b/hdf/src/vattrf.c @@ -20,8 +20,8 @@ * ******************************************************/ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" #include "hproto_fortran.h" /* ----------------- vsfcfdx ---------------------- diff --git a/hdf/src/vconv.c b/hdf/src/vconv.c index e2e63927e1..28a739d33a 100644 --- a/hdf/src/vconv.c +++ b/hdf/src/vconv.c @@ -27,9 +27,9 @@ * Part of the HDF Vset interface. */ -#include "hdfi.h" -#include "hfile.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "hfile_priv.h" +#include "vg_priv.h" /* ** ================================================================== diff --git a/hdf/src/vg.c b/hdf/src/vg.c index 734af64909..b36b6a504d 100644 --- a/hdf/src/vg.c +++ b/hdf/src/vg.c @@ -61,8 +61,8 @@ PRIVATE functions manipulate vsdir and are used only within this file. PRIVATE data structures in here pertain to vdata in vsdir only. */ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /* These are used to determine whether a vdata had been created by the library internally, that is, not created by user's application */ diff --git a/hdf/src/vg.h b/hdf/src/vg.h index 8f22e2a91c..2252d97104 100644 --- a/hdf/src/vg.h +++ b/hdf/src/vg.h @@ -20,7 +20,7 @@ * defines symbols and structures used in all v*.c files * * NOTES: - * This include file depends on the basic HDF *.h files hdfi.h and hdf.h. + * This include file depends on the basic HDF *.h file hdf.h. * An 'S' in the comment means that that data field is saved in the HDF file. * ******************************************************************************/ diff --git a/hdf/src/vgint.h b/hdf/src/vg_priv.h similarity index 98% rename from hdf/src/vgint.h rename to hdf/src/vg_priv.h index 454e256b5f..08140add94 100644 --- a/hdf/src/vgint.h +++ b/hdf/src/vg_priv.h @@ -13,26 +13,26 @@ /***************************************************************************** * - * vgint.h + * vg_priv.h * * Part of HDF VSet interface * * defines library private symbols and structures used in v*.c files * * NOTES: - * This include file depends on the basic HDF *.h files hdfi.h and hdf.h. + * This include file depends on the basic HDF *.h files hdf_priv.h and hdf.h. * An 'S' in the comment means that that data field is saved in the HDF file. * ******************************************************************************/ -#ifndef H4_VGINT_H -#define H4_VGINT_H +#ifndef H4_VG_PRIV_H +#define H4_VG_PRIV_H -#include "hdfi.h" -#include "hfile.h" +#include "hdf_priv.h" +#include "hfile_priv.h" /* Include file for Threaded, Balanced Binary Tree implementation */ -#include "tbbt.h" +#include "tbbt_priv.h" /* * typedefs for VGROUP, VDATA and VSUBGROUP @@ -272,4 +272,4 @@ HDFLIBAPI void trimendblanks(char *ss); } #endif -#endif /* H4_VGINT_H */ +#endif /* H4_VG_PRIV_H */ diff --git a/hdf/src/vgf.c b/hdf/src/vgf.c index 02d5aa717c..4559ca8aa5 100644 --- a/hdf/src/vgf.c +++ b/hdf/src/vgf.c @@ -31,8 +31,8 @@ * *********************************************************************** */ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" #include "hproto_fortran.h" /* diff --git a/hdf/src/vgp.c b/hdf/src/vgp.c index 5136f45efe..7fd59fee13 100644 --- a/hdf/src/vgp.c +++ b/hdf/src/vgp.c @@ -101,8 +101,8 @@ EXPORTED ROUTINES *************************************************************************/ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /* These are used to determine whether a vgroup had been created by the library internally, that is, not created by user's application */ diff --git a/hdf/src/vhi.c b/hdf/src/vhi.c index 5596f24b59..538cf02417 100644 --- a/hdf/src/vhi.c +++ b/hdf/src/vhi.c @@ -22,8 +22,8 @@ * VHmakegroup -- makes a vgroup from tag/ref pairs */ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /* ------------------------ VHstoredata ------------------------------- NAME diff --git a/hdf/src/vio.c b/hdf/src/vio.c index 7e1073cb2a..5e34f342e8 100644 --- a/hdf/src/vio.c +++ b/hdf/src/vio.c @@ -58,8 +58,8 @@ EXPORTED ROUTINES *************************************************************************/ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /* Private Function Prototypes */ static intn vunpackvs(VDATA *vs, uint8 buf[], int32 len); diff --git a/hdf/src/vparse.c b/hdf/src/vparse.c index 401640ae4a..dd47693116 100644 --- a/hdf/src/vparse.c +++ b/hdf/src/vparse.c @@ -22,8 +22,8 @@ ************************************************************************/ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" #define ISCOMMA(c) ((c == ',') ? 1 : 0) diff --git a/hdf/src/vrw.c b/hdf/src/vrw.c index 22221a039c..662a870c2c 100644 --- a/hdf/src/vrw.c +++ b/hdf/src/vrw.c @@ -34,8 +34,8 @@ EXPORTED ROUTINES ************************************************************************/ -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" #ifndef MIN #define MIN(a, b) ((a) < (b) ? (a) : (b)) diff --git a/hdf/src/vsfld.c b/hdf/src/vsfld.c index 6a0c756a86..ddb0704f4d 100644 --- a/hdf/src/vsfld.c +++ b/hdf/src/vsfld.c @@ -38,8 +38,8 @@ EXPORTED ROUTINES #include -#include "hdfi.h" -#include "vgint.h" +#include "hdf_priv.h" +#include "vg_priv.h" /* ** ================================================================== diff --git a/hdf/test/buffer.c b/hdf/test/buffer.c index 53ab15c609..6e2a60d2fa 100644 --- a/hdf/test/buffer.c +++ b/hdf/test/buffer.c @@ -29,9 +29,9 @@ #define TESTMASTER -#include "hdfi.h" +#include "hdf_priv.h" #include "tutils.h" -#include "hfile.h" +#include "hfile_priv.h" #define TESTFILE_NAME "tbuffer.hdf" #define EXTFILE_NAME "tbuffer.dat" diff --git a/hdf/test/chunks.c b/hdf/test/chunks.c index e87b623b48..ba481b5b92 100644 --- a/hdf/test/chunks.c +++ b/hdf/test/chunks.c @@ -110,7 +110,7 @@ */ #include "tproto.h" -#include "hchunks.h" +#include "hchunks_priv.h" #define TESTFILE_NAME "tchunks.hdf" #define BUFSIZE 12288 @@ -174,7 +174,7 @@ test_chunks(void) int32 nseek = 0; #endif int32 ret; - HCHUNK_DEF chunk[1]; /* Chunk definition, see 'hchunks.h' */ + HCHUNK_DEF chunk[1]; /* Chunk definition, see 'hchunks_priv.h' */ int32 dims[5]; int32 fill_val_len = 1; uint8 fill_val_u8 = 0; /* test 6 */ diff --git a/hdf/test/comp.c b/hdf/test/comp.c index 1024c7c458..9bbd197621 100644 --- a/hdf/test/comp.c +++ b/hdf/test/comp.c @@ -12,27 +12,16 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* - FILE - comp.c - Test HDF compressed data I/O routines + comp.c - Test HDF compressed data I/O routines - DESIGN These are written to test all combinations of modeling and encoding layers with different number types. - - BUGS/LIMITATIONS - - EXPORTED ROUTINES - - AUTHOR - Quincey Koziol - - MODIFICATION HISTORY - 10/19/93 - Through this header in. */ #include + #include "tproto.h" -#include "hfile.h" +#include "hfile_priv.h" #define TESTFILE_NAME "tcomp.hdf" diff --git a/hdf/test/file1.c b/hdf/test/file1.c index ddbfd40de2..c6a3058c34 100644 --- a/hdf/test/file1.c +++ b/hdf/test/file1.c @@ -16,7 +16,7 @@ */ #include "tproto.h" -#include "hfile.h" +#include "hfile_priv.h" /* This value can cause platform-specific problems as the number of files * that can be open at one time via fopen() is often capped by the OS. diff --git a/hdf/test/mgr.c b/hdf/test/mgr.c index 5916f5b9d8..67df784aad 100644 --- a/hdf/test/mgr.c +++ b/hdf/test/mgr.c @@ -25,7 +25,7 @@ #include "tproto.h" #include "mfgr.h" -#include "mfgri.h" +#include "mfgr_priv.h" /* Local pre-processor macros */ #define XDIM 0 diff --git a/hdf/test/tbv.c b/hdf/test/tbv.c index 3d20c7e8f7..6073eb8d66 100644 --- a/hdf/test/tbv.c +++ b/hdf/test/tbv.c @@ -18,7 +18,7 @@ */ #include "tproto.h" -#include "bitvect.h" +#include "bitvect_priv.h" static void test_1(void); static void test_2(void); diff --git a/hdf/test/tproto.h b/hdf/test/tproto.h index 83140f4c66..8b597eb506 100644 --- a/hdf/test/tproto.h +++ b/hdf/test/tproto.h @@ -14,7 +14,7 @@ #ifndef H4_TPROTO_H #define H4_TPROTO_H -#include "hdfi.h" +#include "hdf_priv.h" #include "tutils.h" void test_an(void); diff --git a/hdf/test/tree.c b/hdf/test/tree.c index da7f3a53eb..e5f6a953aa 100644 --- a/hdf/test/tree.c +++ b/hdf/test/tree.c @@ -15,25 +15,12 @@ FILE tree.c Test HDF Threaded-Balanced-Binary Tree (tbbt) routines. - - REMARKS - - DESIGN - - BUGS/LIMITATIONS - - EXPORTED ROUTINES - - AUTHOR - Quincey Koziol - - MODIFICATION HISTORY - 10/21/93 - Started coding. */ #include + #include "tproto.h" -#include "tbbt.h" +#include "tbbt_priv.h" #define MAX_TEST_SIZE 31 /* maximum number of elements to insert */ #define NUM_TEST_RUNS 100 /* number of times to insert & remove each size */ diff --git a/hdf/test/tutils.h b/hdf/test/tutils.h index 74d628f562..1a0070edfe 100644 --- a/hdf/test/tutils.h +++ b/hdf/test/tutils.h @@ -14,7 +14,7 @@ #ifndef H4_TUTILS_H #define H4_TUTILS_H -#include "hdfi.h" +#include "hdf_priv.h" /* Define these for use in all the tests */ #ifndef TESTMASTER diff --git a/hdf/test/tvnameclass.c b/hdf/test/tvnameclass.c index 9ea545f595..52de664e97 100644 --- a/hdf/test/tvnameclass.c +++ b/hdf/test/tvnameclass.c @@ -15,7 +15,7 @@ * Tests for vgroup's and vdata's name and class name. */ #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #include "tproto.h" #include "tutils.h" diff --git a/hdf/test/tvset.c b/hdf/test/tvset.c index b6e01a5aa1..f4d22a559c 100644 --- a/hdf/test/tvset.c +++ b/hdf/test/tvset.c @@ -22,7 +22,7 @@ * */ #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #include "tproto.h" #define VDATA_COUNT 256 /* make this many Vdatas to check for memory leaks */ diff --git a/hdf/util/hdf2jpeg.c b/hdf/util/hdf2jpeg.c index bde768fe7d..29dce1ba1f 100644 --- a/hdf/util/hdf2jpeg.c +++ b/hdf/util/hdf2jpeg.c @@ -12,7 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" /* Size of the file buffer to copy through */ #define MAX_FILE_BUF 16384 diff --git a/hdf/util/hdfls.c b/hdf/util/hdfls.c index a08715abf2..e7486984d2 100644 --- a/hdf/util/hdfls.c +++ b/hdf/util/hdfls.c @@ -12,7 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #define MAXBUFF 8192 diff --git a/hdf/util/hdfpack.c b/hdf/util/hdfpack.c index 82b91e1abb..c455acab69 100644 --- a/hdf/util/hdfpack.c +++ b/hdf/util/hdfpack.c @@ -33,12 +33,13 @@ ** You must have enough additional disk space for the compacted file. */ -#include "hdf.h" -#include "herr.h" -#include "hfile.h" #include #include +#include "hdf.h" +#include "herr.h" +#include "hfile_priv.h" + typedef struct mydd_t { uint16 tag; uint16 ref; diff --git a/hdf/util/he_main.c b/hdf/util/he_main.c index eb11b66bba..b2db3c00bb 100644 --- a/hdf/util/he_main.c +++ b/hdf/util/he_main.c @@ -61,7 +61,7 @@ *****************************************************************************/ /* ------ he.c ------- main() main HDF interfacing routines */ -#include "hdfi.h" +#include "hdf_priv.h" #include "he.h" #include diff --git a/hdf/util/jpeg2hdf.c b/hdf/util/jpeg2hdf.c index 83ed201b2c..a440fd9c9f 100644 --- a/hdf/util/jpeg2hdf.c +++ b/hdf/util/jpeg2hdf.c @@ -15,7 +15,7 @@ #include #include -#include "hdfi.h" +#include "hdf_priv.h" /* Size of the file buffer to copy through */ #define MAX_FILE_BUF 16384 diff --git a/hdf/util/vshow.c b/hdf/util/vshow.c index 9fa3853e26..683f7c4889 100644 --- a/hdf/util/vshow.c +++ b/hdf/util/vshow.c @@ -28,7 +28,8 @@ ******************************************************************************/ #include "hdf.h" -#include "vgint.h" + +#include "vg_priv.h" static int condensed; diff --git a/java/src/jni/h4jni.h b/java/src/jni/h4jni.h index e793d34fa6..8e122820aa 100644 --- a/java/src/jni/h4jni.h +++ b/java/src/jni/h4jni.h @@ -17,9 +17,10 @@ * */ -#include #include +#include + #ifndef Included_h4jni #define Included_h4jni diff --git a/java/src/jni/hdfImp.c b/java/src/jni/hdfImp.c index 187395eb0d..6874d575c3 100644 --- a/java/src/jni/hdfImp.c +++ b/java/src/jni/hdfImp.c @@ -20,16 +20,19 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" -#include "hfile.h" + +#include "hdf.h" +#include "hfile_priv.h" /* only needed for library version symbols */ #include "h4jni.h" #include "hdfImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * Class: hdf_hdflib_HDFLibrary * Method: Hopen diff --git a/java/src/jni/hdfanImp.c b/java/src/jni/hdfanImp.c index f2b8545ec8..120f23779a 100644 --- a/java/src/jni/hdfanImp.c +++ b/java/src/jni/hdfanImp.c @@ -20,17 +20,19 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include #include #include -#include "hdfi.h" + +#include + +#include "hdf.h" #include "h4jni.h" #include "hdfanImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jlong JNICALL Java_hdf_hdflib_HDFLibrary_ANstart(JNIEnv *env, jclass clss, jlong file_id) { diff --git a/java/src/jni/hdfdfpalImp.c b/java/src/jni/hdfdfpalImp.c index a285d7c6b2..78681d87a0 100644 --- a/java/src/jni/hdfdfpalImp.c +++ b/java/src/jni/hdfdfpalImp.c @@ -20,17 +20,19 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#include #include #include -#include "hdfi.h" + +#include + +#include "hdf.h" #include "h4jni.h" #include "hdfdfpalImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jboolean JNICALL Java_hdf_hdflib_HDFLibrary_DFPaddpal(JNIEnv *env, jclass clss, jstring filename, jbyteArray palette) { diff --git a/java/src/jni/hdfdfuImp.c b/java/src/jni/hdfdfuImp.c index 69380a9dbb..8aa3e2b0f7 100644 --- a/java/src/jni/hdfdfuImp.c +++ b/java/src/jni/hdfdfuImp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfdfuImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jboolean JNICALL Java_hdf_hdflib_HDFLibrary_DFUfptoimage(JNIEnv *env, jclass clss, jint hdim, jint vdim, jfloat max, jfloat min, jfloatArray hscale, jfloatArray vscale, jfloatArray data, diff --git a/java/src/jni/hdfexceptionImp.c b/java/src/jni/hdfexceptionImp.c index 324507d148..5603e39424 100644 --- a/java/src/jni/hdfexceptionImp.c +++ b/java/src/jni/hdfexceptionImp.c @@ -18,12 +18,9 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfexceptionImp.h" @@ -86,6 +83,10 @@ extern "C" { /********************/ static jboolean H4JNIErrorClass(JNIEnv *env, const char *message, const char *className); +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * Class: hdf_hdflib_HDFLibraryException * Method: printStackTrace0 diff --git a/java/src/jni/hdfgrImp.c b/java/src/jni/hdfgrImp.c index b1ac1c0fa6..6e8d4d8a07 100644 --- a/java/src/jni/hdfgrImp.c +++ b/java/src/jni/hdfgrImp.c @@ -20,16 +20,19 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" + +#include "hdf.h" #include "mfhdf.h" #include "h4jni.h" #include "hdfgrImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + extern jboolean makeChunkInfo(JNIEnv *env, jobject chunkobj, int32 flgs, HDF_CHUNK_DEF *cinf); extern jboolean getNewCompInfo(JNIEnv *env, jobject ciobj, comp_info *cinf); extern jboolean setNewCompInfo(JNIEnv *env, jobject ciobj, comp_coder_t coder, comp_info *cinf); diff --git a/java/src/jni/hdfheImp.c b/java/src/jni/hdfheImp.c index 8f89d1577a..4d20cbc4a6 100644 --- a/java/src/jni/hdfheImp.c +++ b/java/src/jni/hdfheImp.c @@ -20,16 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" -#include "hfile.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfheImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jint JNICALL Java_hdf_hdflib_HDFLibrary_HEvalue(JNIEnv *env, jclass clss, jint level) { diff --git a/java/src/jni/hdfhxImp.c b/java/src/jni/hdfhxImp.c index 6e95d16125..326b760837 100644 --- a/java/src/jni/hdfhxImp.c +++ b/java/src/jni/hdfhxImp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfhxImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jboolean JNICALL Java_hdf_hdflib_HDFLibrary_HXsetcreatedir(JNIEnv *env, jclass clss, jstring dir) { diff --git a/java/src/jni/hdfnativeImp.c b/java/src/jni/hdfnativeImp.c index 276c446d02..1815297d0e 100644 --- a/java/src/jni/hdfnativeImp.c +++ b/java/src/jni/hdfnativeImp.c @@ -30,15 +30,16 @@ * but unavoidable performance hit. */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfnativeImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* returns int [] */ JNIEXPORT jintArray JNICALL Java_hdf_hdflib_HDFNativeData_byteToInt___3B(JNIEnv *env, jclass clss, jbyteArray bdata) diff --git a/java/src/jni/hdfr24Imp.c b/java/src/jni/hdfr24Imp.c index fd24c3000c..16e098ce94 100644 --- a/java/src/jni/hdfr24Imp.c +++ b/java/src/jni/hdfr24Imp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfr24Imp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + extern jboolean getOldCompInfo(JNIEnv *env, jobject ciobj, comp_info *cinf); JNIEXPORT jboolean JNICALL diff --git a/java/src/jni/hdfr8Imp.c b/java/src/jni/hdfr8Imp.c index 54e372ef11..a24b9355ae 100644 --- a/java/src/jni/hdfr8Imp.c +++ b/java/src/jni/hdfr8Imp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfr8Imp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + extern jboolean getOldCompInfo(JNIEnv *env, jobject ciobj, comp_info *cinf); JNIEXPORT jboolean JNICALL diff --git a/java/src/jni/hdfsdsImp.c b/java/src/jni/hdfsdsImp.c index 3cdcf1691b..65cd64839d 100644 --- a/java/src/jni/hdfsdsImp.c +++ b/java/src/jni/hdfsdsImp.c @@ -20,16 +20,19 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" + +#include "hdf.h" #include "mfhdf.h" #include "h4jni.h" #include "hdfsdsImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + extern jboolean makeChunkInfo(JNIEnv *env, jobject chunkobj, int32 flgs, HDF_CHUNK_DEF *cinf); extern jboolean getNewCompInfo(JNIEnv *env, jobject ciobj, comp_info *cinf); extern jboolean setNewCompInfo(JNIEnv *env, jobject ciobj, comp_coder_t coder, comp_info *cinf); diff --git a/java/src/jni/hdfstructsutil.c b/java/src/jni/hdfstructsutil.c index 3178b3fd39..a90bd94ec0 100644 --- a/java/src/jni/hdfstructsutil.c +++ b/java/src/jni/hdfstructsutil.c @@ -19,15 +19,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfstructsutil.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + /* * Get information from a Java HDFNewCompInfo object in to a C comp_info * struct. diff --git a/java/src/jni/hdfvdataImp.c b/java/src/jni/hdfvdataImp.c index 44999b779e..a04696b37d 100644 --- a/java/src/jni/hdfvdataImp.c +++ b/java/src/jni/hdfvdataImp.c @@ -20,15 +20,18 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvdataImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jlong JNICALL Java_hdf_hdflib_HDFLibrary_VSattach(JNIEnv *env, jclass clss, jlong fid, jint vdata_ref, jstring accessmode) { diff --git a/java/src/jni/hdfvfImp.c b/java/src/jni/hdfvfImp.c index 41c0764f99..af2ed17fa8 100644 --- a/java/src/jni/hdfvfImp.c +++ b/java/src/jni/hdfvfImp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvfImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jint JNICALL Java_hdf_hdflib_HDFLibrary_VFfieldesize(JNIEnv *env, jclass clss, jlong vdata_id, int field_index) { diff --git a/java/src/jni/hdfvgroupImp.c b/java/src/jni/hdfvgroupImp.c index 3c40fa8866..aedc94b3c1 100644 --- a/java/src/jni/hdfvgroupImp.c +++ b/java/src/jni/hdfvgroupImp.c @@ -20,15 +20,18 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvgroupImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jboolean JNICALL Java_hdf_hdflib_HDFLibrary_Vstart(JNIEnv *env, jclass clss, jlong fid) { diff --git a/java/src/jni/hdfvhImp.c b/java/src/jni/hdfvhImp.c index 6e308b1127..b5ddd5684c 100644 --- a/java/src/jni/hdfvhImp.c +++ b/java/src/jni/hdfvhImp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvhImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jint JNICALL Java_hdf_hdflib_HDFLibrary_VHmakegroup(JNIEnv *env, jclass clss, jlong file_id, jintArray tag_array, jintArray ref_array, jint n_objects, jstring vgroup_name, diff --git a/java/src/jni/hdfvqImp.c b/java/src/jni/hdfvqImp.c index 3a4bfb2a1a..08828b4de6 100644 --- a/java/src/jni/hdfvqImp.c +++ b/java/src/jni/hdfvqImp.c @@ -20,15 +20,16 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvqImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jint JNICALL Java_hdf_hdflib_HDFLibrary_VQueryref(JNIEnv *env, jclass clss, jlong vkey) { diff --git a/java/src/jni/hdfvsqImp.c b/java/src/jni/hdfvsqImp.c index 80126cc3e2..42aac9da63 100644 --- a/java/src/jni/hdfvsqImp.c +++ b/java/src/jni/hdfvsqImp.c @@ -20,15 +20,18 @@ * */ -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +#include #include -#include "hdfi.h" + +#include "hdf.h" #include "h4jni.h" #include "hdfvsqImp.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + JNIEXPORT jboolean JNICALL Java_hdf_hdflib_HDFLibrary_VSQuerycount(JNIEnv *env, jclass clss, jlong vdata_id, jintArray n_records) { diff --git a/mfhdf/dumper/hdp.c b/mfhdf/dumper/hdp.c index 43be0323fc..011b634372 100644 --- a/mfhdf/dumper/hdp.c +++ b/mfhdf/dumper/hdp.c @@ -12,8 +12,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdp.h" -#include "local_nc.h" -#include "vgint.h" + +#include "nc_priv.h" +#include "vg_priv.h" /********************/ /* Global Variables */ diff --git a/mfhdf/dumper/hdp.h b/mfhdf/dumper/hdp.h index a203fdbc8c..a6ccab9365 100644 --- a/mfhdf/dumper/hdp.h +++ b/mfhdf/dumper/hdp.h @@ -15,7 +15,7 @@ #define DUMPER_HDP_H #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" /* Global Variables */ extern intn vinit_done; diff --git a/mfhdf/dumper/hdp_sds.c b/mfhdf/dumper/hdp_sds.c index 411fdf1a1f..59492c39b0 100644 --- a/mfhdf/dumper/hdp_sds.c +++ b/mfhdf/dumper/hdp_sds.c @@ -22,8 +22,8 @@ intn have_szip = 1; #else intn have_szip = 0; #endif -#include "cszip.h" -#include "local_nc.h" /* to use some definitions */ +#include "cszip_priv.h" +#include "nc_priv.h" /* to use some definitions */ void dumpsds_usage(intn argc, char *argv[]) diff --git a/mfhdf/dumper/show.c b/mfhdf/dumper/show.c index e42b562eab..9a3326b8ca 100644 --- a/mfhdf/dumper/show.c +++ b/mfhdf/dumper/show.c @@ -14,7 +14,8 @@ /* Modified from vshow.c by Eric Tsui, 12/25/1994. */ #include "hdp.h" -#include "vgint.h" + +#include "vg_priv.h" #define BUFFER 1000000 diff --git a/mfhdf/fortran/CMakeLists.txt b/mfhdf/fortran/CMakeLists.txt index 0eac84b7a4..09185fe709 100644 --- a/mfhdf/fortran/CMakeLists.txt +++ b/mfhdf/fortran/CMakeLists.txt @@ -17,7 +17,6 @@ endif () set (HDF4_MFHDF_LIBSRC_CSTUB_FHDRS ${HDF4_MFHDFSOURCE_DIR}/hdf2netcdf.h ${HDF4_MFHDFSOURCE_DIR}/mfhdf.h - ${HDF4_MFHDFSOURCE_DIR}/mfhdfi.h ) if (HDF4_ENABLE_NETCDF) # set (HDF4_MFHDF_LIBSRC_CSTUB_FSRCS ${HDF4_MFHDF_LIBSRC_CSTUB_FSRCS} ${HDF4_BINARY_DIR}/jackets.c) diff --git a/mfhdf/fortran/common.inc b/mfhdf/fortran/common.inc deleted file mode 100644 index 9f55f56ab1..0000000000 --- a/mfhdf/fortran/common.inc +++ /dev/null @@ -1,147 +0,0 @@ -c -c Functions in the FORTRAN interface - - integer nccre, ncopn, ncddef, ncdid, ncvdef, ncvid, nctlen - integer ncsfil - external nccre, ncopn, ncddef, ncdid, ncvdef, ncvid, nctlen - external ncsfil - - integer NCRDWR,NCCREAT,NCEXCL,NCINDEF,NCNSYNC,NCHSYNC - integer NCNDIRTY,NCHDIRTY,NCLINK,NCNOWRIT,NCWRITE - integer NCCLOB,NCNOCLOB,NCGLOBAL,NCFILL,NCNOFILL - integer MAXNCOP,MAXNCDIM,MAXNCATT,MAXNCVAR - integer MAXNCNAM,MAXVDIMS,NCNOERR,NCEBADID - integer NCENFILE,NCEEXIST,NCEINVAL,NCEPERM,NCENOTIN - integer NCEINDEF,NCECOORD,NCEMAXDS,NCENAME - integer NCENOATT,NCEMAXAT,NCEBADTY,NCEBADD, NCESTS - integer NCEUNLIM,NCEMAXVS,NCENOTVR,NCEGLOB,NCENOTNC - integer NCFOOBAR,NCSYSERR,NCFATAL,NCVERBOS, NCENTOOL - - integer NCBYTE,NCCHAR,NCSHORT,NCLONG,NCFLOAT,NCDOUBLE - - parameter(NCBYTE = 1) - parameter(NCCHAR = 2) - parameter(NCSHORT = 3) - parameter(NCLONG = 4) - parameter(NCFLOAT = 5) - parameter(NCDOUBLE = 6) - -c -c masks for the struct NC flag field; passed in as 'mode' arg to -c nccreate and ncopen. -c - -c read/write, 0 => readonly - parameter(NCRDWR = 1) -c in create phase, cleared by ncendef - parameter(NCCREAT = 2) -c on create destroy existing file - parameter(NCEXCL = 4) -c in define mode, cleared by ncendef - parameter(NCINDEF = 8) -c synchronise numrecs on change (X'10') - parameter(NCNSYNC = 16) -c synchronise whole header on change (X'20') - parameter(NCHSYNC = 32) -c numrecs has changed (X'40') - parameter(NCNDIRTY = 64) -c header info has changed (X'80') - parameter(NCHDIRTY = 128) -c prefill vars on endef and increase of record, the default behavior - parameter(NCFILL = 0) -c don't fill vars on endef and increase of record (X'100') - parameter(NCNOFILL = 256) -c isa link (X'8000') - parameter(NCLINK = 32768) - -c -c 'mode' arguments for nccreate and ncopen -c - - parameter(NCNOWRIT = 0) - parameter(NCWRITE = NCRDWR) - parameter(NCCLOB = 11) - parameter(NCNOCLOB = 15) -c -c 'size' argument to ncdimdef for an unlimited dimension -c - LONG_INT NCUNLIM - parameter(NCUNLIM = 0) - -c -c attribute id to put/get a global attribute -c - parameter(NCGLOBAL = 0) -c -c Advisory Maximums -c - parameter(MAXNCOP = 32) - parameter(MAXNCDIM = 32) - parameter(MAXNCATT = 512) - parameter(MAXNCVAR = 512) -c Not enforced - parameter(MAXNCNAM = 128) - parameter(MAXVDIMS = MAXNCDIM) - - -c -c The netcdf data types -c - -c -c Global netcdf error status variable -c Initialized in error.c -c - -c No Error - parameter(NCNOERR = 0) -c Not a netcdf id - parameter(NCEBADID = 1) -c Too many netcdfs open - parameter(NCENFILE = 2) -c netcdf file exists && NCNOCLOB - parameter(NCEEXIST = 3) -c Invalid Argument - parameter(NCEINVAL = 4) -c Write to read only - parameter(NCEPERM = 5) -c Operation not allowed in data mode - parameter(NCENOTIN = 6) -c Operation not allowed in define mode - parameter(NCEINDEF = 7) -c Coordinates out of Domain - parameter(NCECOORD = 8) -c MAXNCDIMS exceeded - parameter(NCEMAXDS = 9) -c String match to name in use - parameter(NCENAME = 10) -c Attribute not found - parameter(NCENOATT = 11) -c MAXNCATTRS exceeded - parameter(NCEMAXAT = 12) -c Not a netcdf data type - parameter(NCEBADTY = 13) -c Invalid dimension id - parameter(NCEBADD = 14) -c NCUNLIMITED in the wrong index - parameter(NCEUNLIM = 15) -c MAXNCVARS exceeded - parameter(NCEMAXVS = 16) -c Variable not found - parameter(NCENOTVR = 17) -c Action prohibited on NCGLOBAL varid - parameter(NCEGLOB = 18) -c Not a netcdf file - parameter(NCENOTNC = 19) - parameter(NCESTS = 20) - parameter (NCENTOOL = 21) - parameter(NCFOOBAR = 32) - parameter(NCSYSERR = -1) - - -c -c Global options variable. Used to determine behavior of error handler. -c Initialized in lerror.c -c - parameter(NCFATAL = 1) - parameter(NCVERBOS = 2) diff --git a/mfhdf/fortran/jackets.c.in b/mfhdf/fortran/jackets.c.in index f03c23c448..f5afdd80a3 100644 --- a/mfhdf/fortran/jackets.c.in +++ b/mfhdf/fortran/jackets.c.in @@ -14,11 +14,12 @@ * */ -#include -#include -#include -#include -#include "local_nc.h" +#include +#include +#include +#include + +#include "nc_priv.h" #if !NC_OLD_FILLVALUES diff --git a/mfhdf/hdfimport/hdfimport.c b/mfhdf/hdfimport/hdfimport.c index 5af88669ba..389e742ff9 100644 --- a/mfhdf/hdfimport/hdfimport.c +++ b/mfhdf/hdfimport/hdfimport.c @@ -177,7 +177,7 @@ #include #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #include "mfhdf.h" #ifdef H4_HAVE_SYS_STAT_H diff --git a/mfhdf/hdiff/hdiff_array.c b/mfhdf/hdiff/hdiff_array.c index dff1b9d5a5..4d75f70e76 100644 --- a/mfhdf/hdiff/hdiff_array.c +++ b/mfhdf/hdiff/hdiff_array.c @@ -20,10 +20,11 @@ #include #include #include + #include "hdf.h" #include "mfhdf.h" #include "hdiff.h" -#include "vgint.h" +#include "vg_priv.h" #ifndef ABS #define ABS(a) (((a) >= 0) ? (a) : -(a)) diff --git a/mfhdf/hdiff/hdiff_main.c b/mfhdf/hdiff/hdiff_main.c index 0bdbdd4863..8540bb0620 100644 --- a/mfhdf/hdiff/hdiff_main.c +++ b/mfhdf/hdiff/hdiff_main.c @@ -19,7 +19,7 @@ #include "h4getopt.h" #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #include "mfhdf.h" #include "hdiff.h" diff --git a/mfhdf/hdiff/hdiff_vs.c b/mfhdf/hdiff/hdiff_vs.c index 1cc834d8b4..80e4e13217 100644 --- a/mfhdf/hdiff/hdiff_vs.c +++ b/mfhdf/hdiff/hdiff_vs.c @@ -15,7 +15,7 @@ #include "hdiff_list.h" #include "hdiff_mattbl.h" -#include "vgint.h" +#include "vg_priv.h" static void fmt_print(uint8 *x, int32 type); static uint32 vdata_cmp(int32 vs1, int32 vs2, char *gname, char *cname, diff_opt_t *opt); diff --git a/mfhdf/hrepack/hrepack_main.c b/mfhdf/hrepack/hrepack_main.c index 56dfa589b5..c55b9351b7 100644 --- a/mfhdf/hrepack/hrepack_main.c +++ b/mfhdf/hrepack/hrepack_main.c @@ -12,7 +12,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "hdf.h" -#include "hfile.h" +#include "hfile_priv.h" #include "mfhdf.h" #include "hrepack.h" #include "hrepack_parse.h" diff --git a/mfhdf/libsrc/CMakeLists.txt b/mfhdf/libsrc/CMakeLists.txt index 6d17d7fc0f..56dc6539d1 100644 --- a/mfhdf/libsrc/CMakeLists.txt +++ b/mfhdf/libsrc/CMakeLists.txt @@ -5,7 +5,7 @@ project (HDF4_MFHDF_LIBSRC C) # Generate the netcdf.h file containing user settings needed by compilation #----------------------------------------------------------------------------- if (WIN32) - set (H4_WINDOWS_INCLUDE_FILE "#include ") + set (H4_WINDOWS_INCLUDE_FILE "#include ") set (NETCDF_EXTERN HDFLIBAPI) else () set (NETCDF_EXTERN extern) @@ -38,15 +38,14 @@ set (HDF4_MFHDF_LIBSRC_INSTALL_CHDRS ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/hdf2netcdf.h ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/mfdatainfo.h ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/mfhdf.h - ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/mfhdfi.h ) set (HDF4_MFHDF_LIBSRC_CHDRS ${HDF4_MFHDF_LIBSRC_INSTALL_CHDRS} - ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/error.h - ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/h4_xdr.h - ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/local_nc.h - ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/mfprivate.h + ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/error_priv.h + ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/h4_xdr_priv.h + ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/mf_priv.h + ${HDF4_MFHDF_LIBSRC_SOURCE_DIR}/nc_priv.h ) if (HDF4_ENABLE_NETCDF) diff --git a/mfhdf/libsrc/Makefile.am b/mfhdf/libsrc/Makefile.am index dae0e31b7f..ffef141c44 100644 --- a/mfhdf/libsrc/Makefile.am +++ b/mfhdf/libsrc/Makefile.am @@ -36,11 +36,9 @@ endif libmfhdf_la_LIBADD = $(top_builddir)/hdf/src/libdf.la if HDF_BUILD_NETCDF -include_HEADERS = hdf2netcdf.h mfhdf.h netcdf.h mfdatainfo.h \ - mfhdfi.h +include_HEADERS = hdf2netcdf.h mfhdf.h netcdf.h mfdatainfo.h else -include_HEADERS = hdf2netcdf.h mfhdf.h hdf4_netcdf.h mfdatainfo.h \ - mfhdfi.h +include_HEADERS = hdf2netcdf.h mfhdf.h hdf4_netcdf.h mfdatainfo.h endif # The following is a workaround. Since Fortran is included in this diff --git a/mfhdf/libsrc/array.c b/mfhdf/libsrc/array.c index f821696965..5b7b105548 100644 --- a/mfhdf/libsrc/array.c +++ b/mfhdf/libsrc/array.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" /* * for a netcdf type diff --git a/mfhdf/libsrc/attr.c b/mfhdf/libsrc/attr.c index 762af6a562..5f3ddb9db4 100644 --- a/mfhdf/libsrc/attr.c +++ b/mfhdf/libsrc/attr.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" NC_attr * NC_new_attr(const char *name, nc_type type, unsigned count, const void *values) diff --git a/mfhdf/libsrc/cdf.c b/mfhdf/libsrc/cdf.c index b19edc59d5..595f7d9739 100644 --- a/mfhdf/libsrc/cdf.c +++ b/mfhdf/libsrc/cdf.c @@ -14,10 +14,10 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" -#include "herr.h" +#include "nc_priv.h" +#include "herr_priv.h" -#include "hfile.h" +#include "hfile_priv.h" int32 hdf_get_magicnum(const char *filename); diff --git a/mfhdf/libsrc/dim.c b/mfhdf/libsrc/dim.c index 73bc28794b..08ca191f66 100644 --- a/mfhdf/libsrc/dim.c +++ b/mfhdf/libsrc/dim.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" NC_dim * NC_new_dim(const char *name, long size) diff --git a/mfhdf/libsrc/error.c b/mfhdf/libsrc/error.c index 3b57466072..1e910c8e3e 100644 --- a/mfhdf/libsrc/error.c +++ b/mfhdf/libsrc/error.c @@ -22,7 +22,7 @@ #include #include -#include "local_nc.h" +#include "nc_priv.h" /* * Log SYSTEM errors diff --git a/mfhdf/libsrc/error.h b/mfhdf/libsrc/error_priv.h similarity index 100% rename from mfhdf/libsrc/error.h rename to mfhdf/libsrc/error_priv.h diff --git a/mfhdf/libsrc/file.c b/mfhdf/libsrc/file.c index d7a8d4766e..a2cf72074e 100644 --- a/mfhdf/libsrc/file.c +++ b/mfhdf/libsrc/file.c @@ -16,8 +16,8 @@ #include -#include "local_nc.h" -#include "herr.h" +#include "nc_priv.h" +#include "herr_priv.h" #if defined H4_HAVE_WIN32_API && !defined __MINGW32__ typedef int pid_t; diff --git a/mfhdf/libsrc/globdef.c b/mfhdf/libsrc/globdef.c index 49884fbf76..8a55f3d40d 100644 --- a/mfhdf/libsrc/globdef.c +++ b/mfhdf/libsrc/globdef.c @@ -19,7 +19,7 @@ * to allow the creation of SunOS sharable-libraries. */ -#include "local_nc.h" +#include "nc_priv.h" #ifdef H4_HAVE_NETCDF #include "netcdf.h" diff --git a/mfhdf/libsrc/h4_xdr.c b/mfhdf/libsrc/h4_xdr.c index 689a44ba2b..14bf7cc69c 100644 --- a/mfhdf/libsrc/h4_xdr.c +++ b/mfhdf/libsrc/h4_xdr.c @@ -36,14 +36,14 @@ * xdr. */ -#include "local_nc.h" +#include "nc_priv.h" /* Which header files include htonl() ? */ #ifdef H4_HAVE_WIN32_API /* Use winsock on Win32 (including MinGW) * - * This is included in hdfi.h to ensure winsock2.h is included before + * This is included in hdf_priv.h to ensure winsock2.h is included before * windows.h. */ #else @@ -56,7 +56,7 @@ #endif #endif -#include "h4_xdr.h" +#include "h4_xdr_priv.h" /* * This is the number of bytes per unit of external data. diff --git a/mfhdf/libsrc/h4_xdr.h b/mfhdf/libsrc/h4_xdr_priv.h similarity index 97% rename from mfhdf/libsrc/h4_xdr.h rename to mfhdf/libsrc/h4_xdr_priv.h index 1ea2cf27ba..1c8a1b2aca 100644 --- a/mfhdf/libsrc/h4_xdr.h +++ b/mfhdf/libsrc/h4_xdr_priv.h @@ -32,10 +32,10 @@ * Copyright (C) 1984, Sun Microsystems, Inc. */ -#ifndef H4_XDR_H -#define H4_XDR_H +#ifndef H4_XDR_PRIV_H +#define H4_XDR_PRIV_H -#include "local_nc.h" +#include "nc_priv.h" /* NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE NOTE * @@ -120,4 +120,4 @@ HDFLIBAPI void h4_xdr_setup_nofile(XDR *xdrs, int ncop); } #endif -#endif /* H4_XDR_H */ +#endif /* H4_XDR_PRIV_H */ diff --git a/mfhdf/libsrc/hdfsds.c b/mfhdf/libsrc/hdfsds.c index 3f17bd6784..5a5cf8847e 100644 --- a/mfhdf/libsrc/hdfsds.c +++ b/mfhdf/libsrc/hdfsds.c @@ -72,7 +72,7 @@ **************************************************************************/ -#include "local_nc.h" +#include "nc_priv.h" #define SDG_MAX_INITIAL 100 diff --git a/mfhdf/libsrc/iarray.c b/mfhdf/libsrc/iarray.c index 8d20ba81b8..aee9700b90 100644 --- a/mfhdf/libsrc/iarray.c +++ b/mfhdf/libsrc/iarray.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" /* values: VAX C doesn't like values[] */ NC_iarray * diff --git a/mfhdf/libsrc/mfprivate.h b/mfhdf/libsrc/mf_priv.h similarity index 93% rename from mfhdf/libsrc/mfprivate.h rename to mfhdf/libsrc/mf_priv.h index c1b0d0325b..22cf0f506d 100644 --- a/mfhdf/libsrc/mfprivate.h +++ b/mfhdf/libsrc/mf_priv.h @@ -11,7 +11,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /****************************************************************************** -file - mfprivate.h +file - mf_priv.h This file contains prototypes of private functions that are implemented in mfsd.c. Some of them are used by new functions in mfdatainfo.c. @@ -19,13 +19,12 @@ file - mfprivate.h separately from the rest of the API. These functions were introduced by the hmap project. - Aug 8, 2010 -BMR ******************************************************************************/ -#ifndef MFH4_MFPRIVATE_H -#define MFH4_MFPRIVATE_H +#ifndef MFH4_MF_PRIV_H +#define MFH4_MF_PRIV_H -#include "local_nc.h" +#include "nc_priv.h" /* Get the dimension record */ NC_dim *SDIget_dim(NC *handle, int32 id); @@ -51,4 +50,4 @@ intn SDIapfromid(int32 id, NC **handlep, NC_array ***app); /* Check permission on the file */ int SDI_can_clobber(const char *name); -#endif /* MFH4_MFPRIVATE_H */ +#endif /* MFH4_MF_PRIV_H */ diff --git a/mfhdf/libsrc/mfdatainfo.c b/mfhdf/libsrc/mfdatainfo.c index fb51ebe829..2b8bd84186 100644 --- a/mfhdf/libsrc/mfdatainfo.c +++ b/mfhdf/libsrc/mfdatainfo.c @@ -41,7 +41,7 @@ LOCAL ROUTINES ******************************************************************************/ -#include "local_nc.h" +#include "nc_priv.h" #ifndef DATAINFO_MASTER #define DATAINFO_MASTER @@ -58,7 +58,7 @@ LOCAL ROUTINES #ifdef MFSD_INTERNAL /* Local function prototypes */ -#include "mfprivate.h" +#include "mf_priv.h" #endif static intn get_attr_tag(char *attr_name, uint16 *attr_tag); diff --git a/mfhdf/libsrc/mfhdf.h b/mfhdf/libsrc/mfhdf.h index 192426e2d9..c918dd2635 100644 --- a/mfhdf/libsrc/mfhdf.h +++ b/mfhdf/libsrc/mfhdf.h @@ -29,8 +29,6 @@ #include "hdf4_netcdf.h" #endif -#include "mfhdfi.h" - #define SD_UNLIMITED NC_UNLIMITED /* use this as marker for unlimited dimension */ #define SD_NOFILL NC_NOFILL #define SD_FILL NC_FILL @@ -38,6 +36,17 @@ #define SD_DIMVAL_BW_INCOMP 0 #define SD_RAGGED -1 /* marker for ragged dimension */ +/* enumerated type used to specify whether a variable is an SDS, coordinate + * variable, or its type is unknown because it was created before HDF4.2r2 + * + * NOTE: Formerly in mfhdfi.h + */ +typedef enum { + IS_SDSVAR = 0, /* variable is an actual SDS */ + IS_CRDVAR = 1, /* variable is a coordinate variable */ + UNKNOWN = 2 /* variable is created before HDF4.2r2, unknown type */ +} hdf_vartype_t; + /* used to indicate the type of the variable at an index */ typedef struct hdf_varlist { int32 var_index; /* index of the current variable */ diff --git a/mfhdf/libsrc/mfhdfi.h b/mfhdf/libsrc/mfhdfi.h deleted file mode 100644 index 84ecf2ae2a..0000000000 --- a/mfhdf/libsrc/mfhdfi.h +++ /dev/null @@ -1,25 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Copyright by The HDF Group. * - * Copyright by the Board of Trustees of the University of Illinois. * - * All rights reserved. * - * * - * This file is part of HDF. The full HDF copyright notice, including * - * terms governing use, modification, and redistribution, is contained in * - * the COPYING file, which can be found at the root of the source code * - * distribution tree, or in https://support.hdfgroup.org/ftp/HDF/releases/. * - * If you do not have access to either file, you may request a copy from * - * help@hdfgroup.org. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -#ifndef MFH4_MFHDFI_H -#define MFH4_MFHDFI_H - -/* enumerated type used to specify whether a variable is an SDS, coordinate - variable, or its type is unknown because it was created before HDF4.2r2 */ -typedef enum { - IS_SDSVAR = 0, /* variable is an actual SDS */ - IS_CRDVAR = 1, /* variable is a coordinate variable */ - UNKNOWN = 2 /* variable is created before HDF4.2r2, unknown type */ -} hdf_vartype_t; - -#endif /* MFH4_MFHDFI_H */ diff --git a/mfhdf/libsrc/mfsd.c b/mfhdf/libsrc/mfsd.c index 033abd0b5e..4ac005077a 100644 --- a/mfhdf/libsrc/mfsd.c +++ b/mfhdf/libsrc/mfsd.c @@ -83,10 +83,10 @@ NOTE: This file needs to have the comments cleaned up for most of the ******************************************************************************/ -#include "local_nc.h" +#include "nc_priv.h" #include "mfhdf.h" -#include "hfile.h" +#include "hfile_priv.h" #ifdef H4_HAVE_LIBSZ /* we have the szip library */ #include "szlib.h" @@ -101,7 +101,7 @@ NOTE: This file needs to have the comments cleaned up for most of the #ifdef MFSD_INTERNAL /* Private function prototypes */ -#include "mfprivate.h" +#include "mf_priv.h" #endif intn SDsetup_szip_parms(int32 id, NC *handle, comp_info *c_info, int32 *cdims); diff --git a/mfhdf/libsrc/local_nc.h b/mfhdf/libsrc/nc_priv.h similarity index 99% rename from mfhdf/libsrc/local_nc.h rename to mfhdf/libsrc/nc_priv.h index 4e7d710091..8bc0fdae02 100644 --- a/mfhdf/libsrc/local_nc.h +++ b/mfhdf/libsrc/nc_priv.h @@ -17,7 +17,7 @@ #ifndef MFH4_LOCAL_NC_H #define MFH4_LOCAL_NC_H -#include "hdfi.h" +#include "hdf_priv.h" /* * netcdf library 'private' data structures, objects and interfaces @@ -28,7 +28,7 @@ #endif /* HDF4's stripped-down XDR implementation */ -#include "h4_xdr.h" +#include "h4_xdr_priv.h" #ifdef H4_HAVE_NETCDF #include "netcdf.h" /* needed for defs of nc_type, ncvoid, ... */ @@ -53,8 +53,8 @@ */ #include "vg.h" -#include "hfile.h" -#include "mfhdfi.h" +#include "hfile_priv.h" +#include "mfhdf.h" #define ATTR_TAG DFTAG_VH #define DIM_TAG DFTAG_VG diff --git a/mfhdf/libsrc/nssdc.c b/mfhdf/libsrc/nssdc.c index 9f4bfc5719..19e9289b75 100644 --- a/mfhdf/libsrc/nssdc.c +++ b/mfhdf/libsrc/nssdc.c @@ -11,8 +11,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" -#include "hfile.h" +#include "nc_priv.h" +#include "hfile_priv.h" /* constants/macros pulled out of the CDF library source */ #define V2_CDR_OFFSET 8 diff --git a/mfhdf/libsrc/putget.c b/mfhdf/libsrc/putget.c index 992bddbccd..bb81a35e14 100644 --- a/mfhdf/libsrc/putget.c +++ b/mfhdf/libsrc/putget.c @@ -14,8 +14,8 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" -#include "hfile.h" +#include "nc_priv.h" +#include "hfile_priv.h" /* Local function prototypes */ static bool_t nssdc_xdr_NCvdata(NC *handle, NC_var *vp, unsigned long where, nc_type type, uint32 count, diff --git a/mfhdf/libsrc/putgetg.c b/mfhdf/libsrc/putgetg.c index 8c31c6012f..288d7483b5 100644 --- a/mfhdf/libsrc/putgetg.c +++ b/mfhdf/libsrc/putgetg.c @@ -23,7 +23,7 @@ * */ -#include "local_nc.h" +#include "nc_priv.h" /* * Perform I/O on a generalized hyperslab. The efficiency of this diff --git a/mfhdf/libsrc/sharray.c b/mfhdf/libsrc/sharray.c index fa737a91ac..16bc17609f 100644 --- a/mfhdf/libsrc/sharray.c +++ b/mfhdf/libsrc/sharray.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" /* you may wish to tune this: big on a cray, small on a PC? */ #define NC_SHRT_BUFSIZ 8192 diff --git a/mfhdf/libsrc/string.c b/mfhdf/libsrc/string.c index 934bb8a5bb..413e6126c9 100644 --- a/mfhdf/libsrc/string.c +++ b/mfhdf/libsrc/string.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" static uint32 compute_hash(unsigned count, const char *str) diff --git a/mfhdf/libsrc/var.c b/mfhdf/libsrc/var.c index 830a168c45..38a0886055 100644 --- a/mfhdf/libsrc/var.c +++ b/mfhdf/libsrc/var.c @@ -14,7 +14,7 @@ * help@hdfgroup.org. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "local_nc.h" +#include "nc_priv.h" NC_var * NC_new_var(const char *name, nc_type type, int ndims, const int *dims) diff --git a/mfhdf/ncdump/ncdump.c b/mfhdf/ncdump/ncdump.c index d77dcf149c..bff4267d50 100644 --- a/mfhdf/ncdump/ncdump.c +++ b/mfhdf/ncdump/ncdump.c @@ -8,7 +8,7 @@ #include #include -#include "local_nc.h" +#include "nc_priv.h" #include "ncdump.h" #include "h4getopt.h" diff --git a/mfhdf/ncgen/ncgen.h b/mfhdf/ncgen/ncgen.h index f874192042..746c225198 100644 --- a/mfhdf/ncgen/ncgen.h +++ b/mfhdf/ncgen/ncgen.h @@ -6,7 +6,7 @@ #ifndef H4NC_NCGEN_H #define H4NC_NCGEN_H -#include "local_nc.h" +#include "nc_priv.h" #include "generic.h" /* defines union generic */ #define H4_MAX_NC_ATTSIZE 2000 /* max size in bytes of an attribute */ diff --git a/mfhdf/test/tdatainfo.c b/mfhdf/test/tdatainfo.c index fa8937c8d1..77f6464e45 100644 --- a/mfhdf/test/tdatainfo.c +++ b/mfhdf/test/tdatainfo.c @@ -27,7 +27,7 @@ #include #include -#include "hdfi.h" +#include "hdf_priv.h" #include "mfhdf.h" #ifdef H4_HAVE_FCNTL_H diff --git a/mfhdf/test/texternal.c b/mfhdf/test/texternal.c index 56934c502c..1b4b075d64 100644 --- a/mfhdf/test/texternal.c +++ b/mfhdf/test/texternal.c @@ -15,7 +15,7 @@ #include /* Need to pick up H4_HAVE_SYS_STAT_H from mfhdf.h */ -#include "hdfi.h" +#include "hdf_priv.h" #include "mfhdf.h" #ifdef H4_HAVE_UNISTD_H diff --git a/mfhdf/test/tfile.c b/mfhdf/test/tfile.c index 8ef915fed4..72b1a4204b 100644 --- a/mfhdf/test/tfile.c +++ b/mfhdf/test/tfile.c @@ -14,7 +14,7 @@ #include "mfhdf.h" #include "hdftest.h" -#include "local_nc.h" +#include "nc_priv.h" /******************************************************************** Name: test_file_inuse() - tests preventing of an in-use file being diff --git a/mfhdf/test/tsd.c b/mfhdf/test/tsd.c index c3a14a838d..0ceac18e3e 100644 --- a/mfhdf/test/tsd.c +++ b/mfhdf/test/tsd.c @@ -18,7 +18,7 @@ #include "mfhdf.h" #include "hdftest.h" -#include "hfile.h" +#include "hfile_priv.h" #define FILE_NAME "sdtest.hdf" /* data file to test ID types */ diff --git a/release_notes/RELEASE.txt b/release_notes/RELEASE.txt index 7a282fa02a..9667e7a884 100644 --- a/release_notes/RELEASE.txt +++ b/release_notes/RELEASE.txt @@ -159,7 +159,6 @@ New features and changes hkit.h linklist.h local_nc.h - mfan.h mfani.h mfgri.h mstdio.h