summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobb Matzke <matzke@llnl.gov>1999-04-15 19:57:50 (GMT)
committerRobb Matzke <matzke@llnl.gov>1999-04-15 19:57:50 (GMT)
commit43c356f93dd4beb691abf8e5acb692438a5f8f00 (patch)
tree5c62c13f1c836def696b3bcc31b02df76aa7faea
parent77d7a3328b044ae71a03bfc6aaac2af4d6eac923 (diff)
downloadhdf5-43c356f93dd4beb691abf8e5acb692438a5f8f00.zip
hdf5-43c356f93dd4beb691abf8e5acb692438a5f8f00.tar.gz
hdf5-43c356f93dd4beb691abf8e5acb692438a5f8f00.tar.bz2
[svn-r1184] Changes since 19990402
---------------------- ./config/commence.in ./config/conclude.in ./test/Makefile.in ./tools/Makefile.in Fixed so private libraries are not installed publicly. The installation directories `bin', `include', and `lib' are created mode 755. ./src/H5.c ./src/H5A.c ./src/H5F.c ./src/H5Fcore.c ./src/H5Fistore.c ./src/H5Flow.c ./src/H5Fmpio.c ./src/H5Fsec2.c ./src/H5Fstdio.c ./src/H5G.c ./src/H5Gent.c ./src/H5Gnode.c ./src/H5HG.c ./src/H5HL.c ./src/H5O.c ./src/H5Oattr.c ./src/H5Ocomp.c ./src/H5Ocont.c ./src/H5Odtype.c ./src/H5Oefl.c ./src/H5Ofill.c ./src/H5Olayout.c ./src/H5Omtime.c ./src/H5Oname.c ./src/H5Osdspace.c ./src/H5Oshared.c ./src/H5Ostab.c ./src/H5R.c ./src/H5Sall.c ./src/H5Shyper.c ./src/H5Smpio.c ./src/H5Snone.c ./src/H5Spoint.c ./src/H5T.c ./src/H5Tconv.c ./src/H5Vprivate.h ./src/H5Z.c ./src/H5detect.c ./src/H5private.h ./test/chunk.c ./test/dsets.c ./test/dtypes.c ./test/h5test.c ./test/overhead.c ./test/ragged.c ./test/tattr.c ./tools/h5dump.c ./tools/h5findshd.c ./tools/h5ls.c Changed `__unused__' to `UNUSED' to fix a conflict with GNU header files. ./src/H5Tpkg.h ./test/h5test.h Removed __unused__ from forward function declarations. ./src/H5P.c Removed a comment about restrictions for the type conversion temporary buffers. Thanks to Quincey, the comment no longer applied. ./src/H5T.c Relaxed the H5Tpack() a little so it would pack compound data structures that had non-transient atomic members. ./tools/h5ls.c Added a `-g' (or `--group') flag that causes information to be printed about the specified group instead of the group's contents. (sort of like Unix's `ls -d'). The `-g' can be used in combination with `-r' to print information about the group and its contents.
-rw-r--r--README2
-rw-r--r--config/commence.in1
-rw-r--r--config/conclude.in17
-rw-r--r--src/H5.c2
-rw-r--r--src/H5AC.c2
-rw-r--r--src/H5Distore.c18
-rw-r--r--src/H5F.c5
-rw-r--r--src/H5Fcore.c18
-rw-r--r--src/H5Fistore.c18
-rw-r--r--src/H5Flow.c2
-rw-r--r--src/H5Fmpio.c4
-rw-r--r--src/H5Fsec2.c12
-rw-r--r--src/H5Fstdio.c14
-rw-r--r--src/H5G.c7
-rw-r--r--src/H5Gent.c2
-rw-r--r--src/H5Gnode.c26
-rw-r--r--src/H5HG.c4
-rw-r--r--src/H5HL.c4
-rw-r--r--src/H5O.c4
-rw-r--r--src/H5Oattr.c4
-rw-r--r--src/H5Ocomp.c10
-rw-r--r--src/H5Ocont.c4
-rw-r--r--src/H5Odtype.c10
-rw-r--r--src/H5Oefl.c8
-rw-r--r--src/H5Ofill.c10
-rw-r--r--src/H5Olayout.c4
-rw-r--r--src/H5Omtime.c10
-rw-r--r--src/H5Oname.c10
-rw-r--r--src/H5Osdspace.c4
-rw-r--r--src/H5Oshared.c6
-rw-r--r--src/H5Ostab.c6
-rw-r--r--src/H5P.c6
-rw-r--r--src/H5R.c2
-rw-r--r--src/H5Sall.c6
-rw-r--r--src/H5Shyper.c4
-rw-r--r--src/H5Smpio.c8
-rw-r--r--src/H5Snone.c2
-rw-r--r--src/H5Spoint.c4
-rw-r--r--src/H5T.c7
-rw-r--r--src/H5Tconv.c591
-rw-r--r--src/H5Tpkg.h2
-rw-r--r--src/H5Vprivate.h12
-rw-r--r--src/H5Z.c2
-rw-r--r--src/H5detect.c2
-rw-r--r--src/H5private.h4
-rw-r--r--test/Makefile.in1
-rw-r--r--test/chunk.c10
-rw-r--r--test/dsets.c6
-rw-r--r--test/dtypes.c6
-rw-r--r--test/h5test.c2
-rw-r--r--test/h5test.h2
-rw-r--r--test/overhead.c6
-rw-r--r--test/ragged.c4
-rw-r--r--test/tattr.c2
-rw-r--r--tools/Makefile.in3
-rw-r--r--tools/h5dump.c8
-rw-r--r--tools/h5findshd.c4
-rw-r--r--tools/h5ls.c40
58 files changed, 508 insertions, 486 deletions
diff --git a/README b/README
index b8d254b..d4dffdd 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.1.73 released on Fri Apr 9 04:20:39 CDT 1999
+This is hdf5-1.1.74 released on Mon Apr 12 08:48:18 EDT 1999
Please refer to the INSTALL file for installation instructions.
------------------------------------------------------------------------------
diff --git a/config/commence.in b/config/commence.in
index 4303cbe..9eac277 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -34,6 +34,7 @@ exec_prefix=@exec_prefix@
bindir=@bindir@
libdir=@libdir@
includedir=@includedir@
+PUB_LIB=$(LIB)
# Shared libraries
LT=$(top_builddir)/libtool
diff --git a/config/conclude.in b/config/conclude.in
index 28dfc36..51cf691 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -44,15 +44,23 @@ check test _test: tests
fi; \
done;
+# Make installation directories directories if they don't exist.
+$(libdir):
+ mkdir $@ && chmod 755 $@
+
+$(includedir):
+ mkdir $@ && chmod 755 $@
+
+$(bindir):
+ mkdir $@ && chmod 755 $@
+
# Install the library, the public header files, and programs.
-install: $(LIB) $(PUB_HDR) $(PROGS)
- @test -d $(libdir) || mkdir $(libdir)
- @for f in X $(LIB); do \
+install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir)
+ @for f in X $(PUB_LIB); do \
if test $$f != X; then \
($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \
fi; \
done
- @test -d $(includedir) || mkdir $(includedir)
@for f in X $(PUB_HDR); do \
if test $$f != X; then \
if test -f $$f; then \
@@ -63,7 +71,6 @@ install: $(LIB) $(PUB_HDR) $(PROGS)
fi; \
fi; \
done
- @test -d $(bindir) || mkdir $(bindir)
@for f in X $(PROGS); do \
if test $$f != X; then \
($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \
diff --git a/src/H5.c b/src/H5.c
index 093d0cc..c2ce573 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -459,7 +459,7 @@ H5close (void)
*-------------------------------------------------------------------------
*/
int
-HDsnprintf(char *buf, size_t __unused__ size, const char *fmt, ...)
+HDsnprintf(char *buf, size_t UNUSED size, const char *fmt, ...)
{
int n;
va_list ap;
diff --git a/src/H5AC.c b/src/H5AC.c
index cc69208..78033e4 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -831,7 +831,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, const haddr_t *addr,
*-------------------------------------------------------------------------
*/
herr_t
-H5AC_debug(H5F_t __unused__ *f)
+H5AC_debug(H5F_t UNUSED *f)
{
#ifdef H5AC_DEBUG
H5AC_subid_t i;
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 1e4802e..89e262b 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -197,7 +197,7 @@ H5B_class_t H5B_ISTORE[1] = {{
*-------------------------------------------------------------------------
*/
static size_t
-H5F_istore_sizeof_rkey(H5F_t __unused__ *f, const void *_udata)
+H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
{
const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata;
size_t nbytes;
@@ -228,7 +228,7 @@ H5F_istore_sizeof_rkey(H5F_t __unused__ *f, const void *_udata)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
+H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn i;
@@ -269,7 +269,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
+H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn ndims = H5F_ISTORE_NDIMS(bt);
@@ -357,7 +357,7 @@ H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth,
*-------------------------------------------------------------------------
*/
static intn
-H5F_istore_cmp2(H5F_t __unused__ *f, void *_lt_key, void *_udata,
+H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata,
void *_rt_key)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
@@ -409,7 +409,7 @@ H5F_istore_cmp2(H5F_t __unused__ *f, void *_lt_key, void *_udata,
*-------------------------------------------------------------------------
*/
static intn
-H5F_istore_cmp3(H5F_t __unused__ *f, void *_lt_key, void *_udata,
+H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata,
void *_rt_key)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
@@ -545,9 +545,9 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_found(H5F_t __unused__ *f, const haddr_t *addr,
+H5F_istore_found(H5F_t UNUSED *f, const haddr_t *addr,
const void *_lt_key, void *_udata,
- const void __unused__ *_rt_key)
+ const void UNUSED *_rt_key)
{
H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata;
const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
@@ -614,9 +614,9 @@ H5F_istore_found(H5F_t __unused__ *f, const haddr_t *addr,
*/
static H5B_ins_t
H5F_istore_insert(H5F_t *f, const haddr_t *addr, void *_lt_key,
- hbool_t __unused__ *lt_key_changed,
+ hbool_t UNUSED *lt_key_changed,
void *_md_key, void *_udata, void *_rt_key,
- hbool_t __unused__ *rt_key_changed,
+ hbool_t UNUSED *rt_key_changed,
haddr_t *new_node/*out*/)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
diff --git a/src/H5F.c b/src/H5F.c
index 67d229c..42884cf 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1807,7 +1807,6 @@ H5F_close(H5F_t *f)
}
#ifdef WIN32
/*free up the memory for path*/
-
free(f->shared->key.path);
#endif
@@ -1896,7 +1895,7 @@ H5Fclose(hid_t file_id)
*/
static herr_t
H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child,
- const H5F_mprop_t __unused__ *plist)
+ const H5F_mprop_t UNUSED *plist)
{
H5G_t *mount_point = NULL; /*mount point group */
H5G_entry_t *mp_ent = NULL; /*mount point symbol table entry*/
@@ -2427,7 +2426,7 @@ H5F_block_write(H5F_t *f, const haddr_t *addr, hsize_t size,
*-------------------------------------------------------------------------
*/
herr_t
-H5F_debug(H5F_t *f, const haddr_t __unused__ *addr, FILE * stream,
+H5F_debug(H5F_t *f, const haddr_t UNUSED *addr, FILE * stream,
intn indent, intn fwidth)
{
FUNC_ENTER(H5F_debug, FAIL);
diff --git a/src/H5Fcore.c b/src/H5Fcore.c
index b4f0cd3..f50429a 100644
--- a/src/H5Fcore.c
+++ b/src/H5Fcore.c
@@ -70,9 +70,9 @@ const H5F_low_class_t H5F_LOW_CORE_g[1] = {{
*-------------------------------------------------------------------------
*/
static htri_t
-H5F_core_access(const char __unused__*name,
- const H5F_access_t __unused__ *access_parms,
- int __unused__ mode, H5F_search_t __unused__ *key/*out*/)
+H5F_core_access(const char UNUSED*name,
+ const H5F_access_t UNUSED *access_parms,
+ int UNUSED mode, H5F_search_t UNUSED *key/*out*/)
{
FUNC_ENTER(H5F_core_access, FAIL);
FUNC_LEAVE(FALSE);
@@ -101,8 +101,8 @@ H5F_core_access(const char __unused__*name,
*-------------------------------------------------------------------------
*/
static H5F_low_t *
-H5F_core_open(const char __unused__ *name,
- const H5F_access_t __unused__ *access_parms,
+H5F_core_open(const char UNUSED *name,
+ const H5F_access_t UNUSED *access_parms,
uintn flags, H5F_search_t *key/*out*/)
{
H5F_low_t *lf = NULL;
@@ -150,7 +150,7 @@ H5F_core_open(const char __unused__ *name,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_core_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_core_close(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
FUNC_ENTER(H5F_core_close, FAIL);
@@ -183,8 +183,8 @@ H5F_core_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_core_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+H5F_core_read(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, uint8_t *buf)
{
size_t n;
@@ -232,7 +232,7 @@ H5F_core_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
*/
static herr_t
H5F_core_write(H5F_low_t *lf, const H5F_access_t *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, const uint8_t *buf)
{
size_t need_more, na;
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 1e4802e..89e262b 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -197,7 +197,7 @@ H5B_class_t H5B_ISTORE[1] = {{
*-------------------------------------------------------------------------
*/
static size_t
-H5F_istore_sizeof_rkey(H5F_t __unused__ *f, const void *_udata)
+H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
{
const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata;
size_t nbytes;
@@ -228,7 +228,7 @@ H5F_istore_sizeof_rkey(H5F_t __unused__ *f, const void *_udata)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
+H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn i;
@@ -269,7 +269,7 @@ H5F_istore_decode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_encode_key(H5F_t __unused__ *f, H5B_t *bt, uint8_t *raw, void *_key)
+H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
{
H5F_istore_key_t *key = (H5F_istore_key_t *) _key;
intn ndims = H5F_ISTORE_NDIMS(bt);
@@ -357,7 +357,7 @@ H5F_istore_debug_key (FILE *stream, intn indent, intn fwidth,
*-------------------------------------------------------------------------
*/
static intn
-H5F_istore_cmp2(H5F_t __unused__ *f, void *_lt_key, void *_udata,
+H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata,
void *_rt_key)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
@@ -409,7 +409,7 @@ H5F_istore_cmp2(H5F_t __unused__ *f, void *_lt_key, void *_udata,
*-------------------------------------------------------------------------
*/
static intn
-H5F_istore_cmp3(H5F_t __unused__ *f, void *_lt_key, void *_udata,
+H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata,
void *_rt_key)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
@@ -545,9 +545,9 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_istore_found(H5F_t __unused__ *f, const haddr_t *addr,
+H5F_istore_found(H5F_t UNUSED *f, const haddr_t *addr,
const void *_lt_key, void *_udata,
- const void __unused__ *_rt_key)
+ const void UNUSED *_rt_key)
{
H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata;
const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
@@ -614,9 +614,9 @@ H5F_istore_found(H5F_t __unused__ *f, const haddr_t *addr,
*/
static H5B_ins_t
H5F_istore_insert(H5F_t *f, const haddr_t *addr, void *_lt_key,
- hbool_t __unused__ *lt_key_changed,
+ hbool_t UNUSED *lt_key_changed,
void *_md_key, void *_udata, void *_rt_key,
- hbool_t __unused__ *rt_key_changed,
+ hbool_t UNUSED *rt_key_changed,
haddr_t *new_node/*out*/)
{
H5F_istore_key_t *lt_key = (H5F_istore_key_t *) _lt_key;
diff --git a/src/H5Flow.c b/src/H5Flow.c
index fdc9b9f..48c6168 100644
--- a/src/H5Flow.c
+++ b/src/H5Flow.c
@@ -1055,7 +1055,7 @@ H5F_addr_hash(const haddr_t *addr, uintn mod)
*-------------------------------------------------------------------------
*/
herr_t
-H5F_addr_pack(H5F_t __unused__ *f, haddr_t *addr, const unsigned long objno[2])
+H5F_addr_pack(H5F_t UNUSED *f, haddr_t *addr, const unsigned long objno[2])
{
assert(f);
assert(objno);
diff --git a/src/H5Fmpio.c b/src/H5Fmpio.c
index 41cb627..aba0200 100644
--- a/src/H5Fmpio.c
+++ b/src/H5Fmpio.c
@@ -429,7 +429,7 @@ H5F_mpio_open(const char *name, const H5F_access_t *access_parms, uintn flags,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_mpio_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_mpio_close(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
int mpierr;
char mpierrmsg[MPI_MAX_ERROR_STRING];
@@ -921,7 +921,7 @@ H5F_mpio_write(H5F_low_t *lf, H5F_access_t *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_mpio_flush(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_mpio_flush(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
int mpierr;
char mpierrmsg[MPI_MAX_ERROR_STRING];
diff --git a/src/H5Fsec2.c b/src/H5Fsec2.c
index f651337..07781c1 100644
--- a/src/H5Fsec2.c
+++ b/src/H5Fsec2.c
@@ -69,7 +69,7 @@ const H5F_low_class_t H5F_LOW_SEC2_g[1] = {{
*-------------------------------------------------------------------------
*/
static H5F_low_t *
-H5F_sec2_open(const char *name, const H5F_access_t __unused__ *access_parms,
+H5F_sec2_open(const char *name, const H5F_access_t UNUSED *access_parms,
uintn flags, H5F_search_t *key/*out*/)
{
intn oflags;
@@ -156,7 +156,7 @@ H5F_sec2_open(const char *name, const H5F_access_t __unused__ *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_sec2_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_sec2_close(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
FUNC_ENTER(H5F_sec2_close, FAIL);
@@ -191,8 +191,8 @@ H5F_sec2_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_sec2_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+H5F_sec2_read(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, uint8_t *buf)
{
ssize_t n;
@@ -296,8 +296,8 @@ H5F_sec2_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_sec2_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+H5F_sec2_write(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, const uint8_t *buf)
{
uint64_t mask;
diff --git a/src/H5Fstdio.c b/src/H5Fstdio.c
index fc1a482..1683dec 100644
--- a/src/H5Fstdio.c
+++ b/src/H5Fstdio.c
@@ -70,7 +70,7 @@ const H5F_low_class_t H5F_LOW_STDIO_g[1] = {{
*-------------------------------------------------------------------------
*/
static H5F_low_t *
-H5F_stdio_open(const char *name, const H5F_access_t __unused__ *access_parms,
+H5F_stdio_open(const char *name, const H5F_access_t UNUSED *access_parms,
uintn flags, H5F_search_t *key/*out*/)
{
H5F_low_t *lf = NULL;
@@ -147,7 +147,7 @@ H5F_stdio_open(const char *name, const H5F_access_t __unused__ *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_stdio_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_stdio_close(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
FUNC_ENTER(H5F_stdio_close, FAIL);
@@ -182,8 +182,8 @@ H5F_stdio_close(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+H5F_stdio_read(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, uint8_t *buf/*out*/)
{
size_t n;
@@ -291,8 +291,8 @@ H5F_stdio_read(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_stdio_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
- const H5D_transfer_t __unused__ xfer_mode,
+H5F_stdio_write(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms,
+ const H5D_transfer_t UNUSED xfer_mode,
const haddr_t *addr, size_t size, const uint8_t *buf)
{
uint64_t mask;
@@ -376,7 +376,7 @@ H5F_stdio_write(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms,
*-------------------------------------------------------------------------
*/
static herr_t
-H5F_stdio_flush(H5F_low_t *lf, const H5F_access_t __unused__ *access_parms)
+H5F_stdio_flush(H5F_low_t *lf, const H5F_access_t UNUSED *access_parms)
{
FUNC_ENTER(H5F_stdio_flush, FAIL);
diff --git a/src/H5G.c b/src/H5G.c
index 7b76e41..5250bf2 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -1426,7 +1426,8 @@ H5G_open_oid(H5G_entry_t *ent)
/* Open the object, making sure it's a group */
if (NULL==(grp = H5MM_calloc(sizeof(H5G_t)))) {
- HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
+ HGOTO_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL,
+ "memory allocation failed");
}
/* Copy over the symbol table information if it's provided */
@@ -1443,12 +1444,12 @@ H5G_open_oid(H5G_entry_t *ent)
grp->nref = 1;
ret_value = grp;
-done:
+ done:
if (!ret_value && grp) {
H5MM_xfree(grp);
}
FUNC_LEAVE(ret_value);
-} /* end H5G_open_oid() */
+}
/*-------------------------------------------------------------------------
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 7a37e2b..f46e8a3 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -331,7 +331,7 @@ H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_debug(H5F_t __unused__ *f, const H5G_entry_t *ent, FILE * stream,
+H5G_ent_debug(H5F_t UNUSED *f, const H5G_entry_t *ent, FILE * stream,
intn indent, intn fwidth, const haddr_t *heap)
{
const char *lval = NULL;
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index ac2004f..7f95906 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -114,7 +114,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static size_t
-H5G_node_sizeof_rkey(H5F_t *f, const void __unused__ *udata)
+H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED *udata)
{
return H5F_SIZEOF_SIZE(f); /*the name offset */
}
@@ -136,7 +136,7 @@ H5G_node_sizeof_rkey(H5F_t *f, const void __unused__ *udata)
*-------------------------------------------------------------------------
*/
static herr_t
-H5G_node_decode_key(H5F_t *f, H5B_t __unused__ *bt, uint8_t *raw, void *_key)
+H5G_node_decode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key)
{
H5G_node_key_t *key = (H5G_node_key_t *) _key;
@@ -168,7 +168,7 @@ H5G_node_decode_key(H5F_t *f, H5B_t __unused__ *bt, uint8_t *raw, void *_key)
*-------------------------------------------------------------------------
*/
static herr_t
-H5G_node_encode_key(H5F_t *f, H5B_t __unused__ *bt, uint8_t *raw, void *_key)
+H5G_node_encode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key)
{
H5G_node_key_t *key = (H5G_node_key_t *) _key;
@@ -231,8 +231,8 @@ H5G_node_size(H5F_t *f)
*-------------------------------------------------------------------------
*/
static herr_t
-H5G_node_create(H5F_t *f, H5B_ins_t __unused__ op, void *_lt_key,
- void __unused__ *_udata, void *_rt_key, haddr_t *addr/*out*/)
+H5G_node_create(H5F_t *f, H5B_ins_t UNUSED op, void *_lt_key,
+ void UNUSED *_udata, void *_rt_key, haddr_t *addr/*out*/)
{
H5G_node_key_t *lt_key = (H5G_node_key_t *) _lt_key;
H5G_node_key_t *rt_key = (H5G_node_key_t *) _rt_key;
@@ -390,8 +390,8 @@ H5G_node_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr,
*-------------------------------------------------------------------------
*/
static H5G_node_t *
-H5G_node_load(H5F_t *f, const haddr_t *addr, const void __unused__ *_udata1,
- void __unused__ *_udata2)
+H5G_node_load(H5F_t *f, const haddr_t *addr, const void UNUSED *_udata1,
+ void UNUSED *_udata2)
{
H5G_node_t *sym = NULL;
size_t size = 0;
@@ -603,8 +603,8 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key)
*-------------------------------------------------------------------------
*/
static herr_t
-H5G_node_found(H5F_t *f, const haddr_t *addr, const void __unused__ *_lt_key,
- void *_udata, const void __unused__ *_rt_key)
+H5G_node_found(H5F_t *f, const haddr_t *addr, const void UNUSED *_lt_key,
+ void *_udata, const void UNUSED *_rt_key)
{
H5G_bt_ud1_t *bt_udata = (H5G_bt_ud1_t *) _udata;
H5G_node_t *sn = NULL;
@@ -711,10 +711,10 @@ H5G_node_found(H5F_t *f, const haddr_t *addr, const void __unused__ *_lt_key,
*-------------------------------------------------------------------------
*/
static H5B_ins_t
-H5G_node_insert(H5F_t *f, const haddr_t *addr, void __unused__ *_lt_key,
- hbool_t __unused__ *lt_key_changed, void *_md_key,
+H5G_node_insert(H5F_t *f, const haddr_t *addr, void UNUSED *_lt_key,
+ hbool_t UNUSED *lt_key_changed, void *_md_key,
void *_udata, void *_rt_key,
- hbool_t __unused__ *rt_key_changed, haddr_t *new_node)
+ hbool_t UNUSED *rt_key_changed, haddr_t *new_node)
{
H5G_node_key_t *md_key = (H5G_node_key_t *) _md_key;
H5G_node_key_t *rt_key = (H5G_node_key_t *) _rt_key;
@@ -880,7 +880,7 @@ H5G_node_insert(H5F_t *f, const haddr_t *addr, void __unused__ *_lt_key,
*/
static H5B_ins_t
H5G_node_remove(H5F_t *f, const haddr_t *addr, void *_lt_key/*in,out*/,
- hbool_t __unused__ *lt_key_changed/*out*/,
+ hbool_t UNUSED *lt_key_changed/*out*/,
void *_udata/*in,out*/, void *_rt_key/*in,out*/,
hbool_t *rt_key_changed/*out*/)
{
diff --git a/src/H5HG.c b/src/H5HG.c
index e6cdf66..ac4f8c7 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -206,8 +206,8 @@ H5HG_create (H5F_t *f, size_t size)
*-------------------------------------------------------------------------
*/
static H5HG_heap_t *
-H5HG_load (H5F_t *f, const haddr_t *addr, const void __unused__ *udata1,
- void __unused__ *udata2)
+H5HG_load (H5F_t *f, const haddr_t *addr, const void UNUSED *udata1,
+ void UNUSED *udata2)
{
H5HG_heap_t *heap = NULL;
H5HG_heap_t *ret_value = NULL;
diff --git a/src/H5HL.c b/src/H5HL.c
index d3da812..9a63846 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -185,8 +185,8 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/)
*-------------------------------------------------------------------------
*/
static H5HL_t *
-H5HL_load(H5F_t *f, const haddr_t *addr, const void __unused__ *udata1,
- void __unused__ *udata2)
+H5HL_load(H5F_t *f, const haddr_t *addr, const void UNUSED *udata1,
+ void UNUSED *udata2)
{
uint8_t hdr[52];
const uint8_t *p = NULL;
diff --git a/src/H5O.c b/src/H5O.c
index ff90661..0cb15a9 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -322,8 +322,8 @@ H5O_close(H5G_entry_t *obj_ent)
*-------------------------------------------------------------------------
*/
static H5O_t *
-H5O_load(H5F_t *f, const haddr_t *addr, const void __unused__ *_udata1,
- void __unused__ *_udata2)
+H5O_load(H5F_t *f, const haddr_t *addr, const void UNUSED *_udata1,
+ void UNUSED *_udata2)
{
H5O_t *oh = NULL;
H5O_t *ret_value = NULL;
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index d74d2c4..3d2cabf 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -83,7 +83,7 @@ static intn interface_initialize_g = 0;
* Added a version number at the beginning.
--------------------------------------------------------------------------*/
static void *
-H5O_attr_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_attr_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5A_t *attr = NULL;
H5S_simple_t *simple; /*simple dimensionality information */
@@ -313,7 +313,7 @@ H5O_attr_copy(const void *_src, void *_dst)
* Added padding between message parts for alignment.
--------------------------------------------------------------------------*/
static size_t
-H5O_attr_size(H5F_t __unused__ *f, const void *mesg)
+H5O_attr_size(H5F_t UNUSED *f, const void *mesg)
{
size_t ret_value = 0;
size_t name_len;
diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c
index a21bf01..f812253 100644
--- a/src/H5Ocomp.c
+++ b/src/H5Ocomp.c
@@ -61,8 +61,8 @@ const H5O_class_t H5O_PLINE[1] = {{
*-------------------------------------------------------------------------
*/
static void *
-H5O_pline_decode(H5F_t __unused__ *f, const uint8_t *p,
- H5O_shared_t __unused__ *sh)
+H5O_pline_decode(H5F_t UNUSED *f, const uint8_t *p,
+ H5O_shared_t UNUSED *sh)
{
H5O_pline_t *pline = NULL;
void *ret_value = NULL;
@@ -165,7 +165,7 @@ H5O_pline_decode(H5F_t __unused__ *f, const uint8_t *p,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_pline_encode (H5F_t __unused__ *f, uint8_t *p/*out*/, const void *mesg)
+H5O_pline_encode (H5F_t UNUSED *f, uint8_t *p/*out*/, const void *mesg)
{
const H5O_pline_t *pline = (const H5O_pline_t*)mesg;
size_t i, j, name_length;
@@ -317,7 +317,7 @@ H5O_pline_copy (const void *_src, void *_dst/*out*/)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_pline_size (H5F_t __unused__ *f, const void *mesg)
+H5O_pline_size (H5F_t UNUSED *f, const void *mesg)
{
const H5O_pline_t *pline = (const H5O_pline_t*)mesg;
size_t i, size, name_len;
@@ -406,7 +406,7 @@ H5O_pline_reset (void *mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_pline_debug (H5F_t __unused__ *f, const void *mesg, FILE *stream,
+H5O_pline_debug (H5F_t UNUSED *f, const void *mesg, FILE *stream,
intn indent, intn fwidth)
{
const H5O_pline_t *pline = (const H5O_pline_t *)mesg;
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 4cd3776..722a0f9 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -67,7 +67,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5O_cont_t *cont = NULL;
@@ -139,7 +139,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_cont_debug(H5F_t __unused__ *f, const void *_mesg, FILE * stream,
+H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
intn indent, intn fwidth)
{
const H5O_cont_t *cont = (const H5O_cont_t *) _mesg;
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 9f45a6c..a0da1ac 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -560,8 +560,8 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
function using malloc() and is returned to the caller.
--------------------------------------------------------------------------*/
static void *
-H5O_dtype_decode(H5F_t __unused__ *f, const uint8_t *p,
- H5O_shared_t __unused__ *sh)
+H5O_dtype_decode(H5F_t UNUSED *f, const uint8_t *p,
+ H5O_shared_t UNUSED *sh)
{
H5T_t *dt = NULL;
@@ -602,7 +602,7 @@ H5O_dtype_decode(H5F_t __unused__ *f, const uint8_t *p,
message in the "raw" disk form.
--------------------------------------------------------------------------*/
static herr_t
-H5O_dtype_encode(H5F_t __unused__ *f, uint8_t *p, const void *mesg)
+H5O_dtype_encode(H5F_t UNUSED *f, uint8_t *p, const void *mesg)
{
const H5T_t *dt = (const H5T_t *) mesg;
@@ -779,7 +779,7 @@ H5O_dtype_reset(void *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_dtype_get_share (H5F_t __unused__ *f, const void *_mesg,
+H5O_dtype_get_share (H5F_t UNUSED *f, const void *_mesg,
H5O_shared_t *sh/*out*/)
{
const H5T_t *dt = (const H5T_t *)_mesg;
@@ -816,7 +816,7 @@ H5O_dtype_get_share (H5F_t __unused__ *f, const void *_mesg,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_dtype_set_share (H5F_t __unused__ *f, void *_mesg/*in,out*/,
+H5O_dtype_set_share (H5F_t UNUSED *f, void *_mesg/*in,out*/,
const H5O_shared_t *sh)
{
H5T_t *dt = (H5T_t *)_mesg;
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index 0da84d2..79d4058 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -64,7 +64,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5O_efl_t *mesg = NULL;
intn i, version;
@@ -405,7 +405,7 @@ H5O_efl_total_size (H5O_efl_t *efl)
*-------------------------------------------------------------------------
*/
herr_t
-H5O_efl_read (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
+H5O_efl_read (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t *addr,
hsize_t size, uint8_t *buf)
{
int i, fd=-1;
@@ -489,7 +489,7 @@ H5O_efl_read (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
*-------------------------------------------------------------------------
*/
herr_t
-H5O_efl_write (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
+H5O_efl_write (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t *addr,
hsize_t size, const uint8_t *buf)
{
int i, fd=-1;
@@ -572,7 +572,7 @@ H5O_efl_write (H5F_t __unused__ *f, const H5O_efl_t *efl, haddr_t *addr,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_efl_debug(H5F_t __unused__ *f, const void *_mesg, FILE * stream,
+H5O_efl_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
intn indent, intn fwidth)
{
const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg;
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 3bfff1a..70a9780 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -61,8 +61,8 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_fill_decode(H5F_t __unused__ *f, const uint8_t *p,
- H5O_shared_t __unused__ *sh)
+H5O_fill_decode(H5F_t UNUSED *f, const uint8_t *p,
+ H5O_shared_t UNUSED *sh)
{
H5O_fill_t *mesg=NULL;
void *ret_value = NULL;
@@ -111,7 +111,7 @@ H5O_fill_decode(H5F_t __unused__ *f, const uint8_t *p,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_fill_encode(H5F_t __unused__ *f, uint8_t *p, const void *_mesg)
+H5O_fill_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
{
const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg;
@@ -202,7 +202,7 @@ H5O_fill_copy(const void *_mesg, void *_dest)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_fill_size(H5F_t __unused__ *f, const void *_mesg)
+H5O_fill_size(H5F_t UNUSED *f, const void *_mesg)
{
const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg;
@@ -262,7 +262,7 @@ H5O_fill_reset(void *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_fill_debug(H5F_t __unused__ *f, const void *_mesg, FILE *stream,
+H5O_fill_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
intn indent, intn fwidth)
{
const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg;
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index b045b3d..6a266a3 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -64,7 +64,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5O_layout_t *mesg = NULL;
intn i, version;
@@ -261,7 +261,7 @@ H5O_layout_size(H5F_t *f, const void *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_layout_debug(H5F_t __unused__ *f, const void *_mesg, FILE * stream,
+H5O_layout_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
intn indent, intn fwidth)
{
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 36157be..e16b283 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -60,8 +60,8 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_mtime_decode(H5F_t __unused__ *f, const uint8_t *p,
- H5O_shared_t __unused__ *sh)
+H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p,
+ H5O_shared_t UNUSED *sh)
{
time_t *mesg, the_time;
intn i;
@@ -175,7 +175,7 @@ H5O_mtime_decode(H5F_t __unused__ *f, const uint8_t *p,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_mtime_encode(H5F_t __unused__ *f, uint8_t *p, const void *_mesg)
+H5O_mtime_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
{
const time_t *mesg = (const time_t *) _mesg;
struct tm *tm;
@@ -258,7 +258,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_mtime_size(H5F_t __unused__ *f, const void __unused__ *mesg)
+H5O_mtime_size(H5F_t UNUSED *f, const void UNUSED *mesg)
{
FUNC_ENTER(H5O_mtime_size, 0);
@@ -286,7 +286,7 @@ H5O_mtime_size(H5F_t __unused__ *f, const void __unused__ *mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_mtime_debug(H5F_t __unused__ *f, const void *_mesg, FILE *stream,
+H5O_mtime_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
intn indent, intn fwidth)
{
const time_t *mesg = (const time_t *)_mesg;
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 3179350..ed9c294 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -69,8 +69,8 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_name_decode(H5F_t __unused__ *f, const uint8_t *p,
- H5O_shared_t __unused__ *sh)
+H5O_name_decode(H5F_t UNUSED *f, const uint8_t *p,
+ H5O_shared_t UNUSED *sh)
{
H5O_name_t *mesg;
@@ -109,7 +109,7 @@ H5O_name_decode(H5F_t __unused__ *f, const uint8_t *p,
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_name_encode(H5F_t __unused__ *f, uint8_t *p, const void *_mesg)
+H5O_name_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
{
const H5O_name_t *mesg = (const H5O_name_t *) _mesg;
@@ -186,7 +186,7 @@ H5O_name_copy(const void *_mesg, void *_dest)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_name_size(H5F_t __unused__ *f, const void *_mesg)
+H5O_name_size(H5F_t UNUSED *f, const void *_mesg)
{
const H5O_name_t *mesg = (const H5O_name_t *) _mesg;
size_t size;
@@ -249,7 +249,7 @@ H5O_name_reset(void *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_name_debug(H5F_t __unused__ *f, const void *_mesg, FILE *stream,
+H5O_name_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
intn indent, intn fwidth)
{
const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index 2400fe9..f76b7bc 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -81,7 +81,7 @@ static intn interface_initialize_g = 0;
Added a version number and reformatted the message for aligment.
--------------------------------------------------------------------------*/
static void *
-H5O_sdspace_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_sdspace_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5S_simple_t *sdim = NULL;/* New simple dimensionality structure */
void *ret_value = NULL;
@@ -379,7 +379,7 @@ H5O_sdspace_size(H5F_t *f, const void *mesg)
parameter.
--------------------------------------------------------------------------*/
static herr_t
-H5O_sdspace_debug(H5F_t __unused__ *f, const void *mesg,
+H5O_sdspace_debug(H5F_t UNUSED *f, const void *mesg,
FILE * stream, intn indent, intn fwidth)
{
const H5S_simple_t *sdim = (const H5S_simple_t *) mesg;
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 962430b..5c2b0e6 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -64,7 +64,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_shared_decode (H5F_t *f, const uint8_t *buf, H5O_shared_t __unused__ *sh)
+H5O_shared_decode (H5F_t *f, const uint8_t *buf, H5O_shared_t UNUSED *sh)
{
H5O_shared_t *mesg;
uintn flags, version;
@@ -176,7 +176,7 @@ H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_shared_size (H5F_t *f, const void __unused__ *_mesg)
+H5O_shared_size (H5F_t *f, const void UNUSED *_mesg)
{
size_t size;
@@ -206,7 +206,7 @@ H5O_shared_size (H5F_t *f, const void __unused__ *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_shared_debug (H5F_t __unused__ *f, const void *_mesg,
+H5O_shared_debug (H5F_t UNUSED *f, const void *_mesg,
FILE *stream, intn indent, intn fwidth)
{
const H5O_shared_t *mesg = (const H5O_shared_t *)_mesg;
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 32f0528..345e429 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -68,7 +68,7 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
static void *
-H5O_stab_decode(H5F_t *f, const uint8_t *p, H5O_shared_t __unused__ *sh)
+H5O_stab_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
{
H5O_stab_t *stab;
@@ -226,7 +226,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
*-------------------------------------------------------------------------
*/
static size_t
-H5O_stab_size(H5F_t *f, const void __unused__ *_mesg)
+H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
{
FUNC_ENTER(H5O_stab_size, 0);
FUNC_LEAVE(2 * H5F_SIZEOF_ADDR(f));
@@ -248,7 +248,7 @@ H5O_stab_size(H5F_t *f, const void __unused__ *_mesg)
*-------------------------------------------------------------------------
*/
static herr_t
-H5O_stab_debug(H5F_t __unused__ *f, const void *_mesg, FILE * stream,
+H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
intn indent, intn fwidth)
{
const H5O_stab_t *stab = (const H5O_stab_t *) _mesg;
diff --git a/src/H5P.c b/src/H5P.c
index dff20bb..99bc563 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -1962,11 +1962,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
* If the buffer size is smaller than the entire amount of data
* being transfered between application and file, and a type
* conversion buffer or background buffer is required then
- * strip mining will be used. However, certain restrictions
- * apply for the size of buffer which can be used for strip
- * mining. For instance, when strip mining a 100x200x300
- * hyperslab of a simple data space the buffer must be large
- * enough to hold a 1x200x300 slab.
+ * strip mining will be used.
*
* If TCONV and/or BKG are null pointers then buffers will be
* allocated and freed during the data transfer.
diff --git a/src/H5R.c b/src/H5R.c
index 0ba7898..c0a412c 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -528,7 +528,7 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
static H5S_t *
-H5R_get_region(H5D_t *dset, H5R_type_t __unused__ ref_type, void *_ref)
+H5R_get_region(H5D_t *dset, H5R_type_t UNUSED ref_type, void *_ref)
{
H5D_t *dataset; /* Pointer to dataset to open */
H5G_entry_t ent; /* Symbol table entry */
diff --git a/src/H5Sall.c b/src/H5Sall.c
index bb83cf9..5e91b6f 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -75,7 +75,7 @@ const H5S_mconv_t H5S_ALL_MCONV[1] = {{
*-------------------------------------------------------------------------
*/
static herr_t
-H5S_all_init (const struct H5O_layout_t __unused__ *layout,
+H5S_all_init (const struct H5O_layout_t UNUSED *layout,
const H5S_t *space, H5S_sel_iter_t *sel_iter)
{
FUNC_ENTER (H5S_all_init, FAIL);
@@ -519,7 +519,7 @@ H5S_all_mscat (const void *_tconv_buf, size_t elmt_size,
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5S_all_release (H5S_t __unused__ *space)
+H5S_all_release (H5S_t UNUSED *space)
{
FUNC_ENTER (H5S_all_release, FAIL);
@@ -624,7 +624,7 @@ H5S_all_select_serialize (const H5S_t *space, uint8_t *buf)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5S_all_select_deserialize (H5S_t *space, const uint8_t __unused__ *buf)
+H5S_all_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
{
herr_t ret_value=FAIL; /* return value */
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index e6c1965..082d033 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -113,7 +113,7 @@ static const hssize_t zero[H5O_LAYOUT_NDIMS]={0}; /* Array of zeros */
*-------------------------------------------------------------------------
*/
static herr_t
-H5S_hyper_init (const struct H5O_layout_t __unused__ *layout,
+H5S_hyper_init (const struct H5O_layout_t UNUSED *layout,
const H5S_t *space, H5S_sel_iter_t *sel_iter)
{
FUNC_ENTER (H5S_hyper_init, FAIL);
@@ -150,7 +150,7 @@ H5S_hyper_init (const struct H5O_layout_t __unused__ *layout,
*-------------------------------------------------------------------------
*/
static size_t
-H5S_hyper_favail (const H5S_t __unused__ *space,
+H5S_hyper_favail (const H5S_t UNUSED *space,
const H5S_sel_iter_t *sel_iter, size_t max)
{
FUNC_ENTER (H5S_hyper_favail, FAIL);
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index dc714c4..a4e090b 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -51,8 +51,8 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
hbool_t *is_derived_type );
static herr_t
H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
- const struct H5O_pline_t __unused__ *pline,
- const struct H5O_efl_t __unused__ *efl, size_t elmt_size,
+ const struct H5O_pline_t UNUSED *pline,
+ const struct H5O_efl_t UNUSED *efl, size_t elmt_size,
const H5S_t *file_space, const H5S_t *mem_space,
const H5D_transfer_t xfer_mode, void *buf /*out*/,
hbool_t *must_convert /*out*/,
@@ -445,8 +445,8 @@ H5S_mpio_space_type( const H5S_t *space, const size_t elmt_size,
*/
herr_t
H5S_mpio_spaces_xfer (H5F_t *f, const struct H5O_layout_t *layout,
- const struct H5O_pline_t __unused__ *pline,
- const struct H5O_efl_t __unused__ *efl, size_t elmt_size,
+ const struct H5O_pline_t UNUSED *pline,
+ const struct H5O_efl_t UNUSED *efl, size_t elmt_size,
const H5S_t *file_space, const H5S_t *mem_space,
const H5D_transfer_t xfer_mode, void *buf /*out*/,
hbool_t *must_convert /*out*/,
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 158c9ab..f0971cf 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -79,7 +79,7 @@ H5S_none_select_serialize (const H5S_t *space, uint8_t *buf)
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5S_none_select_deserialize (H5S_t *space, const uint8_t __unused__ *buf)
+H5S_none_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
{
herr_t ret_value=FAIL; /* return value */
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 5640f04..a4f4931 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -82,7 +82,7 @@ const H5S_mconv_t H5S_POINT_MCONV[1] = {{
*-------------------------------------------------------------------------
*/
static herr_t
-H5S_point_init (const struct H5O_layout_t __unused__ *layout,
+H5S_point_init (const struct H5O_layout_t UNUSED *layout,
const H5S_t *space, H5S_sel_iter_t *sel_iter)
{
FUNC_ENTER (H5S_point_init, FAIL);
@@ -220,7 +220,7 @@ done:
*-------------------------------------------------------------------------
*/
static size_t
-H5S_point_favail (const H5S_t __unused__ *space,
+H5S_point_favail (const H5S_t UNUSED *space,
const H5S_sel_iter_t *sel_iter, size_t max)
{
FUNC_ENTER (H5S_point_favail, FAIL);
diff --git a/src/H5T.c b/src/H5T.c
index e1d9dd1..4919617 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1073,7 +1073,7 @@ H5T_init_interface(void)
*-------------------------------------------------------------------------
*/
static intn
-H5T_unlock_cb (void *_dt, const void __unused__ *key)
+H5T_unlock_cb (void *_dt, const void UNUSED *key)
{
H5T_t *dt = (H5T_t *)_dt;
@@ -5108,9 +5108,10 @@ H5T_pack(H5T_t *dt)
FUNC_ENTER(H5T_pack, FAIL);
assert(dt);
- assert(H5T_STATE_TRANSIENT==dt->state);
if (H5T_COMPOUND == dt->type) {
+ assert(H5T_STATE_TRANSIENT==dt->state);
+
/* Recursively pack the members */
for (i=0; i<dt->u.compnd.nmembs; i++) {
if (H5T_pack(dt->u.compnd.memb[i].type) < 0) {
@@ -6266,7 +6267,7 @@ H5T_entof (H5T_t *dt)
*-------------------------------------------------------------------------
*/
static herr_t
-H5T_print_stats(H5T_path_t __unused__ *path, intn __unused__ *nprint/*in,out*/)
+H5T_print_stats(H5T_path_t UNUSED *path, intn UNUSED *nprint/*in,out*/)
{
#ifdef H5T_DEBUG
hsize_t nbytes;
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 83aa5ca..d1f8c6a 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -355,7 +355,7 @@ static intn interface_initialize_g = 0;
* Purpose: The no-op conversion. The library knows about this
* conversion without it being registered.
*
- * Return: Non-negative on success/Negative on failure
+ * Return: Non-negative on success/Negative on failure
*
* Programmer: Robb Matzke
* Wednesday, January 14, 1998
@@ -365,9 +365,9 @@ static intn interface_initialize_g = 0;
*-------------------------------------------------------------------------
*/
herr_t
-H5T_conv_noop(hid_t __unused__ src_id, hid_t __unused__ dst_id,
- H5T_cdata_t *cdata, size_t __unused__ nelmts,
- void __unused__ *buf, void __unused__ *background)
+H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id,
+ H5T_cdata_t *cdata, size_t UNUSED nelmts,
+ void UNUSED *buf, void UNUSED *background)
{
FUNC_ENTER(H5T_conv_noop, FAIL);
@@ -410,7 +410,7 @@ H5T_conv_noop(hid_t __unused__ src_id, hid_t __unused__ dst_id,
*/
herr_t
H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
- void *_buf, void __unused__ *background)
+ void *_buf, void UNUSED *background)
{
uint8_t *buf = (uint8_t*)_buf;
uint8_t tmp;
@@ -1032,7 +1032,7 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
*/
herr_t
H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *_buf, void __unused__ *bkg)
+ size_t nelmts, void *_buf, void UNUSED *bkg)
{
uint8_t *buf = (uint8_t*)_buf; /*cast for pointer arithmetic */
H5T_t *src=NULL, *dst=NULL; /*src and dst data types */
@@ -1068,8 +1068,9 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
case H5T_CONV_FREE:
#ifdef H5T_DEBUG
if (H5DEBUG(T)) {
- fprintf(H5DEBUG(T), " Using %s mapping function (%s)\n",
- priv->length?"O(N)":"O(N log N)", "N==nelmts");
+ fprintf(H5DEBUG(T), " Using %s mapping function%s\n",
+ priv->length?"O(1)":"O(log N)",
+ priv->length?"":", where N is the number of enum members");
}
#endif
if (priv) {
@@ -1195,7 +1196,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
H5T_t *src = NULL; /*source data type */
H5T_t *dst = NULL; /*destination data type */
@@ -1551,7 +1552,7 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
/* Traversal-related variables */
H5T_t *src_p; /*source data type */
@@ -1949,7 +1950,7 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
- void *buf, void __unused__ *bkg)
+ void *buf, void UNUSED *bkg)
{
H5T_t *src=NULL; /*source data type */
H5T_t *dst=NULL; /*destination data type */
@@ -2179,7 +2180,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
*/
herr_t
H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_uchar, FAIL);
H5T_CONV_su(SCHAR, UCHAR,
@@ -2206,7 +2207,7 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_schar, FAIL);
H5T_CONV_us(UCHAR, SCHAR,
@@ -2234,7 +2235,7 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_short, FAIL);
H5T_CONV_sS(SCHAR, SHORT,
@@ -2261,7 +2262,7 @@ H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_ushort, FAIL);
H5T_CONV_sU(SCHAR, USHORT,
@@ -2288,7 +2289,7 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_short, FAIL);
H5T_CONV_uS(UCHAR, SHORT,
@@ -2316,7 +2317,7 @@ H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_ushort, FAIL);
H5T_CONV_uU(UCHAR, USHORT,
@@ -2343,7 +2344,7 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_int, FAIL);
H5T_CONV_sS(SCHAR, INT,
@@ -2370,7 +2371,7 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_uint, FAIL);
H5T_CONV_sU(SCHAR, UINT,
@@ -2397,7 +2398,7 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_int, FAIL);
H5T_CONV_uS(UCHAR, INT,
@@ -2425,7 +2426,7 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_uint, FAIL);
H5T_CONV_uU(UCHAR, UINT,
@@ -2452,7 +2453,7 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_long, FAIL);
H5T_CONV_sS(SCHAR, LONG,
@@ -2479,7 +2480,7 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_ulong, FAIL);
H5T_CONV_sU(SCHAR, ULONG,
@@ -2506,7 +2507,7 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_long, FAIL);
H5T_CONV_uS(UCHAR, LONG,
@@ -2534,7 +2535,7 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_ulong, FAIL);
H5T_CONV_uU(UCHAR, ULONG,
@@ -2561,7 +2562,7 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_llong, FAIL);
H5T_CONV_sS(SCHAR, LLONG,
@@ -2588,7 +2589,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_schar_ullong, FAIL);
H5T_CONV_sU(SCHAR, ULLONG,
@@ -2615,7 +2616,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_llong, FAIL);
H5T_CONV_uS(UCHAR, LLONG,
@@ -2643,7 +2644,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uchar_ullong, FAIL);
H5T_CONV_uU(UCHAR, ULLONG,
@@ -2670,7 +2671,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_schar, FAIL);
H5T_CONV_Ss(SHORT, SCHAR,
@@ -2698,7 +2699,7 @@ H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_uchar, FAIL);
H5T_CONV_Su(SHORT, UCHAR,
@@ -2726,7 +2727,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_schar, FAIL);
H5T_CONV_Us(USHORT, SCHAR,
@@ -2754,7 +2755,7 @@ H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_uchar, FAIL);
H5T_CONV_Uu(USHORT, UCHAR,
@@ -2782,7 +2783,7 @@ H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_ushort, FAIL);
H5T_CONV_su(SHORT, USHORT,
@@ -2809,7 +2810,7 @@ H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_short, FAIL);
H5T_CONV_us(USHORT, SHORT,
@@ -2837,7 +2838,7 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_int, FAIL);
H5T_CONV_sS(SHORT, INT,
@@ -2864,7 +2865,7 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_uint, FAIL);
H5T_CONV_sU(SHORT, UINT,
@@ -2891,7 +2892,7 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_int, FAIL);
H5T_CONV_uS(USHORT, INT,
@@ -2919,7 +2920,7 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_uint, FAIL);
H5T_CONV_uU(USHORT, UINT,
@@ -2946,7 +2947,7 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_long, FAIL);
H5T_CONV_sS(SHORT, LONG,
@@ -2973,7 +2974,7 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_ulong, FAIL);
H5T_CONV_sU(SHORT, ULONG,
@@ -3000,7 +3001,7 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_long, FAIL);
H5T_CONV_uS(USHORT, LONG,
@@ -3028,7 +3029,7 @@ H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_ulong, FAIL);
H5T_CONV_uU(USHORT, ULONG,
@@ -3055,7 +3056,7 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_llong, FAIL);
H5T_CONV_sS(SHORT, LLONG,
@@ -3082,7 +3083,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_short_ullong, FAIL);
H5T_CONV_sU(SHORT, ULLONG,
@@ -3109,7 +3110,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_llong, FAIL);
H5T_CONV_uS(USHORT, LLONG,
@@ -3137,7 +3138,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ushort_ullong, FAIL);
H5T_CONV_uU(USHORT, ULLONG,
@@ -3164,7 +3165,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_schar, FAIL);
H5T_CONV_Ss(INT, SCHAR,
@@ -3192,7 +3193,7 @@ H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_uchar, FAIL);
H5T_CONV_Su(INT, UCHAR,
@@ -3220,7 +3221,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_schar, FAIL);
H5T_CONV_Us(UINT, SCHAR,
@@ -3248,7 +3249,7 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_uchar, FAIL);
H5T_CONV_Uu(UINT, UCHAR,
@@ -3276,7 +3277,7 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_short, FAIL);
H5T_CONV_Ss(INT, SHORT,
@@ -3304,7 +3305,7 @@ H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_ushort, FAIL);
H5T_CONV_Su(INT, USHORT,
@@ -3332,7 +3333,7 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_short, FAIL);
H5T_CONV_Us(UINT, SHORT,
@@ -3360,7 +3361,7 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_ushort, FAIL);
H5T_CONV_Uu(UINT, USHORT,
@@ -3388,7 +3389,7 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_uint, FAIL);
H5T_CONV_su(INT, UINT,
@@ -3415,7 +3416,7 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_int, FAIL);
H5T_CONV_us(UINT, INT,
@@ -3443,7 +3444,7 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_long, FAIL);
H5T_CONV_sS(INT, LONG,
@@ -3470,7 +3471,7 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_ulong, FAIL);
H5T_CONV_sU(INT, LONG,
@@ -3497,7 +3498,7 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_long, FAIL);
H5T_CONV_uS(UINT, LONG,
@@ -3525,7 +3526,7 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_ulong, FAIL);
H5T_CONV_uU(UINT, ULONG,
@@ -3552,7 +3553,7 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_llong, FAIL);
H5T_CONV_sS(INT, LLONG,
@@ -3579,7 +3580,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_int_ullong, FAIL);
H5T_CONV_sU(INT, ULLONG,
@@ -3606,7 +3607,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_llong, FAIL);
H5T_CONV_uS(UINT, LLONG,
@@ -3634,7 +3635,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_uint_ullong, FAIL);
H5T_CONV_uU(UINT, ULLONG,
@@ -3661,7 +3662,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_schar, FAIL);
H5T_CONV_Ss(LONG, SCHAR,
@@ -3689,7 +3690,7 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_uchar, FAIL);
H5T_CONV_Su(LONG, UCHAR,
@@ -3717,7 +3718,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_schar, FAIL);
H5T_CONV_Us(ULONG, SCHAR,
@@ -3745,7 +3746,7 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_uchar, FAIL);
H5T_CONV_Uu(ULONG, UCHAR,
@@ -3773,7 +3774,7 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_short, FAIL);
H5T_CONV_Ss(LONG, SHORT,
@@ -3801,7 +3802,7 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_ushort, FAIL);
H5T_CONV_Su(LONG, USHORT,
@@ -3829,7 +3830,7 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_short, FAIL);
H5T_CONV_Us(ULONG, SHORT,
@@ -3857,7 +3858,7 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_ushort, FAIL);
H5T_CONV_Uu(ULONG, USHORT,
@@ -3885,7 +3886,7 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_int, FAIL);
H5T_CONV_Ss(LONG, INT,
@@ -3913,7 +3914,7 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_uint, FAIL);
H5T_CONV_Su(LONG, UINT,
@@ -3941,7 +3942,7 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_int, FAIL);
H5T_CONV_Us(ULONG, INT,
@@ -3969,7 +3970,7 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_uint, FAIL);
H5T_CONV_Uu(ULONG, UINT,
@@ -3997,7 +3998,7 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_ulong, FAIL);
H5T_CONV_su(LONG, ULONG,
@@ -4024,7 +4025,7 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_long, FAIL);
H5T_CONV_us(ULONG, LONG,
@@ -4052,7 +4053,7 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_llong, FAIL);
H5T_CONV_sS(LONG, LLONG,
@@ -4079,7 +4080,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_ullong, FAIL);
H5T_CONV_sU(LONG, ULLONG,
@@ -4106,7 +4107,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_long_llong, FAIL);
H5T_CONV_uS(ULONG, LLONG,
@@ -4134,7 +4135,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ulong_ullong, FAIL);
H5T_CONV_uU(ULONG, ULLONG,
@@ -4161,7 +4162,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_schar, FAIL);
H5T_CONV_Ss(LLONG, SCHAR,
@@ -4189,7 +4190,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_uchar, FAIL);
H5T_CONV_Su(LLONG, UCHAR,
@@ -4217,7 +4218,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_schar, FAIL);
H5T_CONV_Us(ULLONG, SCHAR,
@@ -4245,7 +4246,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_uchar, FAIL);
H5T_CONV_Uu(ULLONG, UCHAR,
@@ -4273,7 +4274,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_short, FAIL);
H5T_CONV_Ss(LLONG, SHORT,
@@ -4301,7 +4302,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_ushort, FAIL);
H5T_CONV_Su(LLONG, USHORT,
@@ -4329,7 +4330,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_short, FAIL);
H5T_CONV_Us(ULLONG, SHORT,
@@ -4357,7 +4358,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_ushort, FAIL);
H5T_CONV_Uu(ULLONG, USHORT,
@@ -4385,7 +4386,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_int, FAIL);
H5T_CONV_Ss(LLONG, INT,
@@ -4413,7 +4414,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_uint, FAIL);
H5T_CONV_Su(LLONG, UINT,
@@ -4441,7 +4442,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_int, FAIL);
H5T_CONV_Us(ULLONG, INT,
@@ -4469,7 +4470,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_uint, FAIL);
H5T_CONV_Uu(ULLONG, UINT,
@@ -4497,7 +4498,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_long, FAIL);
H5T_CONV_Ss(LLONG, LONG,
@@ -4525,7 +4526,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_ulong, FAIL);
H5T_CONV_Su(LLONG, ULONG,
@@ -4553,7 +4554,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_long, FAIL);
H5T_CONV_Us(ULLONG, LONG,
@@ -4581,7 +4582,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_ulong, FAIL);
H5T_CONV_Uu(ULLONG, ULONG,
@@ -4609,7 +4610,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_llong_ullong, FAIL);
H5T_CONV_su(LLONG, ULLONG,
@@ -4636,7 +4637,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
FUNC_ENTER(H5T_conv_ullong_llong, FAIL);
H5T_CONV_us(ULLONG, LLONG,
@@ -4663,7 +4664,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
size_t elmtno; /*element number */
float *src, *s; /*source buffer */
@@ -4766,7 +4767,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
size_t elmtno; /*element number */
double *src, *s; /*source buffer */
@@ -4879,7 +4880,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
*/
herr_t
H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg)
+ size_t nelmts, void *buf, void UNUSED *bkg)
{
uint8_t *s=NULL, *d=NULL; /*src and dst buf pointers */
uint8_t tmp[8]; /*temporary destination buffer */
@@ -4930,11 +4931,11 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
break;
case H5T_SGN_2:
if (s[3] & 0x80) {
- sign = 1 ;
+ sign = 1;
for (i=0,cin=1; i<4; i++,cin=cout) {
- s[i] = ~s[i] ;
- cout = ((unsigned)(s[i])+cin > 0xff) ? 1 : 0 ;
- s[i] += cin ;
+ s[i] = ~s[i];
+ cout = ((unsigned)(s[i])+cin > 0xff) ? 1 : 0;
+ s[i] += cin;
}
} else {
sign = 0;
@@ -4950,240 +4951,240 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
* this in a loop, but testing it this way might be faster.
*/
if (s[3]) {
- if (s[3] & 0x80) mbits = 32 ;
- else if (s[3] & 0x40) mbits = 31 ;
- else if (s[3] & 0x20) mbits = 30 ;
- else if (s[3] & 0x10) mbits = 29 ;
- else if (s[3] & 0x08) mbits = 28 ;
- else if (s[3] & 0x04) mbits = 27 ;
- else if (s[3] & 0x02) mbits = 26 ;
- else if (s[3] & 0x01) mbits = 25 ;
+ if (s[3] & 0x80) mbits = 32;
+ else if (s[3] & 0x40) mbits = 31;
+ else if (s[3] & 0x20) mbits = 30;
+ else if (s[3] & 0x10) mbits = 29;
+ else if (s[3] & 0x08) mbits = 28;
+ else if (s[3] & 0x04) mbits = 27;
+ else if (s[3] & 0x02) mbits = 26;
+ else if (s[3] & 0x01) mbits = 25;
} else if (s[2]) {
- if (s[2] & 0x80) mbits = 24 ;
- else if (s[2] & 0x40) mbits = 23 ;
- else if (s[2] & 0x20) mbits = 22 ;
- else if (s[2] & 0x10) mbits = 21 ;
- else if (s[2] & 0x08) mbits = 20 ;
- else if (s[2] & 0x04) mbits = 19 ;
- else if (s[2] & 0x02) mbits = 18 ;
- else if (s[2] & 0x01) mbits = 17 ;
+ if (s[2] & 0x80) mbits = 24;
+ else if (s[2] & 0x40) mbits = 23;
+ else if (s[2] & 0x20) mbits = 22;
+ else if (s[2] & 0x10) mbits = 21;
+ else if (s[2] & 0x08) mbits = 20;
+ else if (s[2] & 0x04) mbits = 19;
+ else if (s[2] & 0x02) mbits = 18;
+ else if (s[2] & 0x01) mbits = 17;
} else if (s[1]) {
- if (s[1] & 0x80) mbits = 16 ;
- else if (s[1] & 0x40) mbits = 15 ;
- else if (s[1] & 0x20) mbits = 14 ;
- else if (s[1] & 0x10) mbits = 13 ;
- else if (s[1] & 0x08) mbits = 12 ;
- else if (s[1] & 0x04) mbits = 11 ;
- else if (s[1] & 0x02) mbits = 10 ;
- else if (s[1] & 0x01) mbits = 9 ;
+ if (s[1] & 0x80) mbits = 16;
+ else if (s[1] & 0x40) mbits = 15;
+ else if (s[1] & 0x20) mbits = 14;
+ else if (s[1] & 0x10) mbits = 13;
+ else if (s[1] & 0x08) mbits = 12;
+ else if (s[1] & 0x04) mbits = 11;
+ else if (s[1] & 0x02) mbits = 10;
+ else if (s[1] & 0x01) mbits = 9;
} else if (s[0]) {
- if (s[0] & 0x80) mbits = 8 ;
- else if (s[0] & 0x40) mbits = 7 ;
- else if (s[0] & 0x20) mbits = 6 ;
- else if (s[0] & 0x10) mbits = 5 ;
- else if (s[0] & 0x08) mbits = 4 ;
- else if (s[0] & 0x04) mbits = 3 ;
- else if (s[0] & 0x02) mbits = 2 ;
- else if (s[0] & 0x01) mbits = 1 ;
+ if (s[0] & 0x80) mbits = 8;
+ else if (s[0] & 0x40) mbits = 7;
+ else if (s[0] & 0x20) mbits = 6;
+ else if (s[0] & 0x10) mbits = 5;
+ else if (s[0] & 0x08) mbits = 4;
+ else if (s[0] & 0x04) mbits = 3;
+ else if (s[0] & 0x02) mbits = 2;
+ else if (s[0] & 0x01) mbits = 1;
} else {
/*zero*/
- d[7] = d[6] = d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- continue ;
+ d[7] = d[6] = d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ continue;
}
/*
* The sign and exponent.
*/
- exponent = (mbits - 1) + 1023 ;
- d[7] = (sign<<7) | ((exponent>>4) & 0x7f) ;
- d[6] = (exponent & 0x0f) << 4 ;
+ exponent = (mbits - 1) + 1023;
+ d[7] = (sign<<7) | ((exponent>>4) & 0x7f);
+ d[6] = (exponent & 0x0f) << 4;
/*
* The mantissa.
*/
switch (mbits) {
case 32:
- d[5] = d[4] = d[3] = d[1] = d[0] = 0 ;
- break ;
+ d[5] = d[4] = d[3] = d[1] = d[0] = 0;
+ break;
case 31:
- d[6] |= 0x0f & (s[3]>>2) ;
- d[5] = (s[3]<<6) | (s[2]>>2) ;
- d[4] = (s[2]<<6) | (s[1]>>2) ;
- d[3] = (s[1]<<6) | (s[0]>>2) ;
- d[2] = (s[0]<<6) ;
- d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[3]>>2);
+ d[5] = (s[3]<<6) | (s[2]>>2);
+ d[4] = (s[2]<<6) | (s[1]>>2);
+ d[3] = (s[1]<<6) | (s[0]>>2);
+ d[2] = (s[0]<<6);
+ d[1] = d[0] = 0;
+ break;
case 30:
- d[6] |= 0x0f & (s[3]>>1) ;
- d[5] = (s[3]<<7) | (s[2]>>1) ;
- d[4] = (s[2]<<7) | (s[1]>>1) ;
- d[3] = (s[1]<<7) | (s[0]>>1) ;
- d[2] = (s[0]<<7) ;
- d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[3]>>1);
+ d[5] = (s[3]<<7) | (s[2]>>1);
+ d[4] = (s[2]<<7) | (s[1]>>1);
+ d[3] = (s[1]<<7) | (s[0]>>1);
+ d[2] = (s[0]<<7);
+ d[1] = d[0] = 0;
+ break;
case 29:
- d[6] |= 0x0f & s[3] ;
- d[5] = s[2] ;
- d[4] = s[1] ;
- d[3] = s[0] ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & s[3];
+ d[5] = s[2];
+ d[4] = s[1];
+ d[3] = s[0];
+ d[2] = d[1] = d[0] = 0;
+ break;
case 28:
- d[6] |= ((s[3]<<1) | (s[2]>>7)) & 0x0f ;
- d[5] = (s[2]<<1) | (s[1]>>7) ;
- d[4] = (s[1]<<1) | (s[0]>>7) ;
- d[3] = (s[0]<<1) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[3]<<1) | (s[2]>>7)) & 0x0f;
+ d[5] = (s[2]<<1) | (s[1]>>7);
+ d[4] = (s[1]<<1) | (s[0]>>7);
+ d[3] = (s[0]<<1);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 27:
- d[6] |= ((s[3]<<2) | (s[2]>>6)) & 0x0f ;
- d[5] = (s[2]<<2) | (s[1]>>6) ;
- d[4] = (s[1]<<2) | (s[0]>>6) ;
- d[3] = (s[0]<<2) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[3]<<2) | (s[2]>>6)) & 0x0f;
+ d[5] = (s[2]<<2) | (s[1]>>6);
+ d[4] = (s[1]<<2) | (s[0]>>6);
+ d[3] = (s[0]<<2);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 26:
- d[6] |= ((s[3]<<3) | (s[2]>>5)) & 0x0f ;
- d[5] = (s[2]<<3) | (s[1]>>5) ;
- d[4] = (s[1]<<3) | (s[0]>>5) ;
- d[3] = (s[0]<<3) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[3]<<3) | (s[2]>>5)) & 0x0f;
+ d[5] = (s[2]<<3) | (s[1]>>5);
+ d[4] = (s[1]<<3) | (s[0]>>5);
+ d[3] = (s[0]<<3);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 25:
- d[6] |= 0x0f & (s[2]>>4) ;
- d[5] = (s[2]<<4) | (s[1]>>4) ;
- d[4] = (s[1]<<4) | (s[0]>>4) ;
- d[3] = (s[0]<<4) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[2]>>4);
+ d[5] = (s[2]<<4) | (s[1]>>4);
+ d[4] = (s[1]<<4) | (s[0]>>4);
+ d[3] = (s[0]<<4);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 24:
- d[6] |= 0x0f & (s[2]>>3) ;
- d[5] = (s[2]<<5) | (s[1]>>3) ;
- d[4] = (s[1]<<5) | (s[0]>>3) ;
- d[3] = (s[0]<<5) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[2]>>3);
+ d[5] = (s[2]<<5) | (s[1]>>3);
+ d[4] = (s[1]<<5) | (s[0]>>3);
+ d[3] = (s[0]<<5);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 23:
- d[6] |= 0x0f & (s[2]>>2) ;
- d[5] = (s[2]<<6) | (s[1]>>2) ;
- d[4] = (s[1]<<6) | (s[0]>>2) ;
- d[3] = (s[0]<<6) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[2]>>2);
+ d[5] = (s[2]<<6) | (s[1]>>2);
+ d[4] = (s[1]<<6) | (s[0]>>2);
+ d[3] = (s[0]<<6);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 22:
- d[6] |= 0x0f & (s[2]>>1) ;
- d[5] = (s[2]<<7) | (s[1]>>1) ;
- d[4] = (s[1]<<7) | (s[0]>>1) ;
- d[3] = (s[0]<<7) ;
- d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[2]>>1);
+ d[5] = (s[2]<<7) | (s[1]>>1);
+ d[4] = (s[1]<<7) | (s[0]>>1);
+ d[3] = (s[0]<<7);
+ d[2] = d[1] = d[0] = 0;
+ break;
case 21:
- d[6] |= 0x0f & s[2] ;
- d[5] = s[1] ;
- d[4] = s[0] ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & s[2];
+ d[5] = s[1];
+ d[4] = s[0];
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 20:
- d[6] |= ((s[2]<<1) | (s[1]>>7)) & 0x0f ;
- d[5] = (s[1]<<1) | (s[0]>>7) ;
- d[4] = (s[0]<<1) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[2]<<1) | (s[1]>>7)) & 0x0f;
+ d[5] = (s[1]<<1) | (s[0]>>7);
+ d[4] = (s[0]<<1);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 19:
- d[6] |= ((s[2]<<2) | (s[1]>>6)) & 0x0f ;
- d[5] = (s[1]<<2) | (s[0]>>6) ;
- d[4] = (s[0]<<2) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[2]<<2) | (s[1]>>6)) & 0x0f;
+ d[5] = (s[1]<<2) | (s[0]>>6);
+ d[4] = (s[0]<<2);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 18:
- d[6] |= ((s[2]<<3) | (s[1]>>5)) & 0x0f ;
- d[5] = (s[1]<<3) | (s[0]>>5) ;
- d[4] = (s[0]<<3) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[2]<<3) | (s[1]>>5)) & 0x0f;
+ d[5] = (s[1]<<3) | (s[0]>>5);
+ d[4] = (s[0]<<3);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 17:
- d[6] |= 0x0f & (s[1]>>4) ;
- d[5] = (s[1]<<4) | (s[0]>>4) ;
- d[4] = (s[0]<<4) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[1]>>4);
+ d[5] = (s[1]<<4) | (s[0]>>4);
+ d[4] = (s[0]<<4);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 16:
- d[6] |= 0x0f & (s[1]>>3) ;
- d[5] = (s[1]<<5) | (s[0]>>3) ;
- d[4] = (s[0]<<5) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[1]>>3);
+ d[5] = (s[1]<<5) | (s[0]>>3);
+ d[4] = (s[0]<<5);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 15:
- d[6] |= 0x0f & (s[1]>>2) ;
- d[5] = (s[1]<<6) | (s[0]>>2) ;
- d[4] = (s[0]<<6) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[1]>>2);
+ d[5] = (s[1]<<6) | (s[0]>>2);
+ d[4] = (s[0]<<6);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 14:
- d[6] |= 0x0f & (s[1]>>1) ;
- d[5] = (s[1]<<7) | (s[0]>>1) ;
- d[4] = (s[0]<<7) ;
- d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[1]>>1);
+ d[5] = (s[1]<<7) | (s[0]>>1);
+ d[4] = (s[0]<<7);
+ d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 13:
- d[6] |= 0x0f & s[1] ;
- d[5] = s[0] ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & s[1];
+ d[5] = s[0];
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 12:
- d[6] |= ((s[1]<<1) | (s[0]>>7)) & 0x0f ;
- d[5] = (s[0]<<1) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[1]<<1) | (s[0]>>7)) & 0x0f;
+ d[5] = (s[0]<<1);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 11:
- d[6] |= ((s[1]<<2) | (s[0]>>6)) & 0x0f ;
- d[5] = (s[0]<<2) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[1]<<2) | (s[0]>>6)) & 0x0f;
+ d[5] = (s[0]<<2);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 10:
- d[6] |= ((s[1]<<3) | (s[0]>>5)) & 0x0f ;
- d[5] = (s[0]<<3) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= ((s[1]<<3) | (s[0]>>5)) & 0x0f;
+ d[5] = (s[0]<<3);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 9:
- d[6] |= 0x0f & (s[0]>>4) ;
- d[5] = (s[0]<<4) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[0]>>4);
+ d[5] = (s[0]<<4);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 8:
- d[6] |= 0x0f & (s[0]>>3) ;
- d[5] = (s[0]<<5) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[0]>>3);
+ d[5] = (s[0]<<5);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 7:
- d[6] |= 0x0f & (s[0]>>2) ;
- d[5] = (s[0]<<6) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[0]>>2);
+ d[5] = (s[0]<<6);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 6:
- d[6] |= 0x0f & (s[0]>>1) ;
- d[5] = (s[0]<<7) ;
- d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & (s[0]>>1);
+ d[5] = (s[0]<<7);
+ d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 5:
- d[6] |= 0x0f & s[0] ;
- d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= 0x0f & s[0];
+ d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 4:
- d[6] |= (s[0]<<1) & 0x0f ;
- d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= (s[0]<<1) & 0x0f;
+ d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 3:
- d[6] |= (s[0]<<2) & 0x0f ;
- d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= (s[0]<<2) & 0x0f;
+ d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 2:
- d[6] |= (s[0]<<3) & 0x0f ;
- d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[6] |= (s[0]<<3) & 0x0f;
+ d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
case 1:
- d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0 ;
- break ;
+ d[5] = d[4] = d[3] = d[2] = d[1] = d[0] = 0;
+ break;
}
/*
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 1b3f2cf..f0906d7 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -164,7 +164,7 @@ __DLL__ herr_t H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
__DLL__ herr_t H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *_buf, void *bkg);
__DLL__ herr_t H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
- size_t nelmts, void *buf, void __unused__ *bkg);
+ size_t nelmts, void *buf, void *bkg);
__DLL__ herr_t H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, void *_buf, void *bkg);
__DLL__ herr_t H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 1e49594..fef02dc 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -93,7 +93,7 @@ __DLL__ herr_t H5V_array_fill(void *_dst, const void *src, size_t size,
*
*-------------------------------------------------------------------------
*/
-static inline hsize_t __unused__
+static inline hsize_t UNUSED
H5V_vector_reduce_product(intn n, const hsize_t *v)
{
size_t ans = 1;
@@ -120,7 +120,7 @@ H5V_vector_reduce_product(intn n, const hsize_t *v)
*
*-------------------------------------------------------------------------
*/
-static inline htri_t __unused__
+static inline htri_t UNUSED
H5V_vector_zerop_u(intn n, const hsize_t *v)
{
if (!v) return TRUE;
@@ -147,7 +147,7 @@ H5V_vector_zerop_u(intn n, const hsize_t *v)
*
*-------------------------------------------------------------------------
*/
-static inline htri_t __unused__
+static inline htri_t UNUSED
H5V_vector_zerop_s(intn n, const hssize_t *v)
{
if (!v) return TRUE;
@@ -176,7 +176,7 @@ H5V_vector_zerop_s(intn n, const hssize_t *v)
*
*-------------------------------------------------------------------------
*/
-static inline intn __unused__
+static inline intn UNUSED
H5V_vector_cmp_u (intn n, const hsize_t *v1, const hsize_t *v2)
{
if (v1 == v2) return 0;
@@ -209,7 +209,7 @@ H5V_vector_cmp_u (intn n, const hsize_t *v1, const hsize_t *v2)
*
*-------------------------------------------------------------------------
*/
-static inline intn __unused__
+static inline intn UNUSED
H5V_vector_cmp_s (intn n, const hssize_t *v1, const hssize_t *v2)
{
if (v1 == v2) return 0;
@@ -237,7 +237,7 @@ H5V_vector_cmp_s (intn n, const hssize_t *v1, const hssize_t *v2)
*
*-------------------------------------------------------------------------
*/
-static inline void __unused__
+static inline void UNUSED
H5V_vector_inc(intn n, hsize_t *v1, const hsize_t *v2)
{
while (n--) *v1++ += *v2++;
diff --git a/src/H5Z.c b/src/H5Z.c
index 8a5b7b3..f5cd902 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -380,7 +380,7 @@ H5Z_find(H5Z_filter_t id)
*-------------------------------------------------------------------------
*/
herr_t
-H5Z_pipeline(H5F_t __unused__ *f, const H5O_pline_t *pline, uintn flags,
+H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, uintn flags,
uintn *filter_mask/*in,out*/, size_t *nbytes/*in,out*/,
size_t *buf_size/*in,out*/, void **buf/*in,out*/)
{
diff --git a/src/H5detect.c b/src/H5detect.c
index 590cf99..cb7cebe 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -332,7 +332,7 @@ precision (detected_t *d)
*-------------------------------------------------------------------------
*/
static void
-sigbus_handler(int __unused__ signo)
+sigbus_handler(int UNUSED signo)
{
signal(SIGBUS, sigbus_handler);
longjmp(jbuf_g, 1);
diff --git a/src/H5private.h b/src/H5private.h
index 651c93e..539e93c 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -150,10 +150,10 @@
* we don't.
*/
#ifdef HAVE_ATTRIBUTE
-# define __unused__ __attribute__((unused))
+# define UNUSED __attribute__((unused))
#else
# define __attribute__(X) /*void*/
-# define __unused__ /*void*/
+# define UNUSED /*void*/
#endif
/*
diff --git a/test/Makefile.in b/test/Makefile.in
index c8d880b..99b201b 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -30,6 +30,7 @@ LIBHDF5=../src/libhdf5.la
LIB=libh5test.a
LIB_SRC=h5test.c
LIB_OBJ=$(LIB_SRC:.c=.o)
+PUB_LIB=
# Temporary files. These files are the ones created by setting the
# HDF5_NOCLEANUP environment variable and running `make test' without
diff --git a/test/chunk.c b/test/chunk.c
index 5a00535..738dd21 100644
--- a/test/chunk.c
+++ b/test/chunk.c
@@ -25,9 +25,9 @@
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
-# define __unused__ /*void*/
+# define UNUSED /*void*/
#else
-# define __unused__ __attribute__((unused))
+# define UNUSED __attribute__((unused))
#endif
#define FILE_NAME "chunk.h5"
@@ -82,9 +82,9 @@ static hid_t fapl_g = -1;
*-------------------------------------------------------------------------
*/
static size_t
-counter (unsigned __unused__ flags, size_t __unused__ cd_nelmts,
- const unsigned __unused__ *cd_values, size_t nbytes,
- size_t __unused__ *buf_size, void __unused__ **buf)
+counter (unsigned UNUSED flags, size_t UNUSED cd_nelmts,
+ const unsigned UNUSED *cd_values, size_t nbytes,
+ size_t UNUSED *buf_size, void UNUSED **buf)
{
nio_g += nbytes;
return nbytes;
diff --git a/test/dsets.c b/test/dsets.c
index 4b221b2..a9cf40e 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -313,9 +313,9 @@ test_tconv(hid_t file)
*-------------------------------------------------------------------------
*/
static size_t
-bogus(unsigned int __unused__ flags, size_t __unused__ cd_nelmts,
- const unsigned int __unused__ cd_values[], size_t nbytes,
- size_t __unused__ *buf_size, void __unused__ **buf)
+bogus(unsigned int UNUSED flags, size_t UNUSED cd_nelmts,
+ const unsigned int UNUSED cd_values[], size_t nbytes,
+ size_t UNUSED *buf_size, void UNUSED **buf)
{
return nbytes;
}
diff --git a/test/dtypes.c b/test/dtypes.c
index 04e5737..0e164c7 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -109,7 +109,7 @@ void some_dummy_func(float x);
*-------------------------------------------------------------------------
*/
static void
-fpe_handler(int __unused__ signo)
+fpe_handler(int UNUSED signo)
{
SKIPPED();
puts(" Test skipped due to SIGFPE.");
@@ -139,8 +139,8 @@ fpe_handler(int __unused__ signo)
*/
#ifdef SHOW_OVERFLOWS
static herr_t
-overflow_handler(hid_t __unused__ src_id, hid_t __unused__ dst_id,
- void __unused__ *src_buf, void __unused__ *dst_buf)
+overflow_handler(hid_t UNUSED src_id, hid_t UNUSED dst_id,
+ void UNUSED *src_buf, void UNUSED *dst_buf)
{
noverflows_g++;
return -1;
diff --git a/test/h5test.c b/test/h5test.c
index 59ac0b8..861b0f0 100644
--- a/test/h5test.c
+++ b/test/h5test.c
@@ -51,7 +51,7 @@
*-------------------------------------------------------------------------
*/
herr_t
-h5_errors(void __unused__ *client_data)
+h5_errors(void UNUSED *client_data)
{
FAILED();
H5Eprint (stdout);
diff --git a/test/h5test.h b/test/h5test.h
index fc26f2f..a5b81da 100644
--- a/test/h5test.h
+++ b/test/h5test.h
@@ -55,7 +55,7 @@ extern "C" {
#endif
int h5_cleanup(hid_t fapl);
-herr_t h5_errors(void __unused__ *client_data);
+herr_t h5_errors(void *client_data);
char *h5_fixname(const char *basename, hid_t fapl, char *fullname,
size_t size);
hid_t h5_fileaccess(void);
diff --git a/test/overhead.c b/test/overhead.c
index 4656fa5..2852064 100644
--- a/test/overhead.c
+++ b/test/overhead.c
@@ -36,9 +36,9 @@
#ifndef HAVE_ATTRIBUTE
# undef __attribute__
# define __attribute__(X) /*void*/
-# define __unused__ /*void*/
+# define UNUSED /*void*/
#else
-# define __unused__ __attribute__((unused))
+# define UNUSED __attribute__((unused))
#endif
#define FILE_NAME_1 "overhead.h5"
@@ -146,7 +146,7 @@ cleanup (void)
*-------------------------------------------------------------------------
*/
static herr_t
-display_error_cb (void __unused__ *client_data)
+display_error_cb (void UNUSED *client_data)
{
puts ("*FAILED*");
H5Eprint (stdout);
diff --git a/test/ragged.c b/test/ragged.c
index 6b75dab..b40e3b1 100644
--- a/test/ragged.c
+++ b/test/ragged.c
@@ -80,7 +80,7 @@ static volatile sig_atomic_t timeout_g = 0;
*-------------------------------------------------------------------------
*/
static void
-catch_alarm(int __unused__ signum)
+catch_alarm(int UNUSED signum)
{
static int ncalls=0;
@@ -110,7 +110,7 @@ catch_alarm(int __unused__ signum)
*-------------------------------------------------------------------------
*/
static herr_t
-display_error_cb (void __unused__ *client_data)
+display_error_cb (void UNUSED *client_data)
{
putchar('\n');
H5Eprint (stdout);
diff --git a/test/tattr.c b/test/tattr.c
index c548974..371ff7c 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -1003,7 +1003,7 @@ test_attr_mult_read(void)
** attr_op1(): Attribute operator
**
****************************************************************/
-int attr_op1(hid_t __unused__ loc_id, const char *name, void *op_data)
+int attr_op1(hid_t UNUSED loc_id, const char *name, void *op_data)
{
int *count=(int *)op_data;
int ret=0;
diff --git a/tools/Makefile.in b/tools/Makefile.in
index daed201..a28f9cf 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -26,9 +26,10 @@ LIB=libh5tools.a
LIBHDF5=../src/libhdf5.la
PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@
-# Source and object files for the library.
+# Source and object files for the library; do not install
LIB_SRC=h5tools.c h5findshd.c
LIB_OBJ=$(LIB_SRC:.c=.o)
+PUB_LIB=
# Source and object files for programs...
PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5dumputil.c h5toh4.c
diff --git a/tools/h5dump.c b/tools/h5dump.c
index 5105cfa..a353e32 100644
--- a/tools/h5dump.c
+++ b/tools/h5dump.c
@@ -472,7 +472,7 @@ dump_dataspace (hid_t space)
*
*-----------------------------------------------------------------------*/
static herr_t
-dump_attr (hid_t attr, const char *attr_name, void __unused__ *op_data)
+dump_attr (hid_t attr, const char *attr_name, void UNUSED *op_data)
{
hid_t attr_id, type, space;
@@ -646,7 +646,7 @@ H5G_stat_t statbuf;
*
*-----------------------------------------------------------------------*/
static herr_t
-dump_all (hid_t group, const char *name, void __unused__ *op_data)
+dump_all (hid_t group, const char *name, void UNUSED *op_data)
{
hid_t obj;
char *buf, *tmp;
@@ -1132,7 +1132,7 @@ int i;
*
*-----------------------------------------------------------------------*/
static herr_t
-find_shared_objs(hid_t group, const char *name, void __unused__ *op_data)
+find_shared_objs(hid_t group, const char *name, void UNUSED *op_data)
{
hid_t obj, type;
H5G_stat_t statbuf;
@@ -1271,7 +1271,7 @@ int i, index, curr_arg, display_bb=0, display_all=1;
int nopts=0, *opts;
char *buf, name[128], name1[128];
H5G_stat_t statbuf;
-void __unused__ *op_data;
+void UNUSED *op_data;
void *edata;
hid_t (*func)(void*);
diff --git a/tools/h5findshd.c b/tools/h5findshd.c
index 20d9492..088aa17 100644
--- a/tools/h5findshd.c
+++ b/tools/h5findshd.c
@@ -222,7 +222,7 @@ int i;
*
*-----------------------------------------------------------------------*/
herr_t
-find_shared_objs(hid_t group, char *name, void __unused__ *op_data)
+find_shared_objs(hid_t group, char *name, void UNUSED *op_data)
{
hid_t obj, type;
H5G_stat_t statbuf;
@@ -326,7 +326,7 @@ int i;
*
*-----------------------------------------------------------------------*/
herr_t
-H5findobj_once(hid_t group, char *name, void __unused__ *op_data)
+H5findobj_once(hid_t group, char *name, void UNUSED *op_data)
{
hid_t obj, type;
H5G_stat_t statbuf;
diff --git a/tools/h5ls.c b/tools/h5ls.c
index 45e0deb..43b579e 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -23,6 +23,7 @@ static hbool_t label_g = FALSE; /*label compound values? */
static hbool_t string_g = FALSE; /*print 1-byte numbers as ASCII? */
static hbool_t fullname_g = FALSE; /*print full path names */
static hbool_t recursive_g = FALSE; /*recursive descent listing */
+static hbool_t grp_literal_g = FALSE; /*list group, not contents */
/* Info to pass to the iteration functions */
typedef struct iter_t {
@@ -84,6 +85,7 @@ usage: %s [OPTIONS] FILE [OBJECTS...]\n\
-h, -?, --help Print a usage message and exit\n\
-d, --dump Print the values of datasets\n\
-f, --full Print full path names instead of base names\n\
+ -g, --group Show information about a group, not its contents\n\
-l, --label Label members of compound datasets\n\
-r, --recursive List all groups recursively, avoiding cycles\n\
-s, --string Print 1-byte integer datasets as ASCII\n\
@@ -269,7 +271,7 @@ display_string(FILE *stream, const char *s, hbool_t escape_spaces)
*-------------------------------------------------------------------------
*/
static hbool_t
-display_native_type(hid_t type, int __unused__ indent)
+display_native_type(hid_t type, int UNUSED indent)
{
if (H5Tequal(type, H5T_NATIVE_SCHAR)) {
printf("native signed char");
@@ -337,7 +339,7 @@ display_native_type(hid_t type, int __unused__ indent)
*-------------------------------------------------------------------------
*/
static hbool_t
-display_ieee_type(hid_t type, int __unused__ indent)
+display_ieee_type(hid_t type, int UNUSED indent)
{
if (H5Tequal(type, H5T_IEEE_F32BE)) {
printf("IEEE 32-bit big-endian float");
@@ -809,7 +811,7 @@ display_enum_type(hid_t type, int indent)
*-------------------------------------------------------------------------
*/
static hbool_t
-display_string_type(hid_t type, int __unused__ indent)
+display_string_type(hid_t type, int UNUSED indent)
{
H5T_str_t pad;
const char *pad_s=NULL;
@@ -897,7 +899,7 @@ display_string_type(hid_t type, int __unused__ indent)
*-------------------------------------------------------------------------
*/
static hbool_t
-display_reference_type(hid_t type, int __unused__ indent)
+display_reference_type(hid_t type, int UNUSED indent)
{
if (H5T_REFERENCE!=H5Tget_class(type)) return FALSE;
@@ -1028,7 +1030,7 @@ dump_dataset_values(hid_t dset)
*-------------------------------------------------------------------------
*/
static herr_t
-list_attr (hid_t obj, const char *attr_name, void __unused__ *op_data)
+list_attr (hid_t obj, const char *attr_name, void UNUSED *op_data)
{
hid_t attr, space, type, p_type;
hsize_t size[64], nelmts=1;
@@ -1170,7 +1172,7 @@ dataset_list1(hid_t dset)
*-------------------------------------------------------------------------
*/
static herr_t
-dataset_list2(hid_t dset, const char __unused__ *name)
+dataset_list2(hid_t dset, const char UNUSED *name)
{
hid_t dcpl; /*dataset creation property list*/
hid_t type; /*data type of dataset */
@@ -1331,7 +1333,7 @@ group_list2(hid_t grp, const char *name)
*-------------------------------------------------------------------------
*/
static herr_t
-datatype_list2(hid_t type, const char __unused__ *name)
+datatype_list2(hid_t type, const char UNUSED *name)
{
if (verbose_g>0) {
printf(" %-10s ", "Type:");
@@ -1360,7 +1362,7 @@ datatype_list2(hid_t type, const char __unused__ *name)
*-------------------------------------------------------------------------
*/
static herr_t
-ragged_list2(hid_t __unused__ ra, const char __unused__ *name)
+ragged_list2(hid_t UNUSED ra, const char UNUSED *name)
{
if (dump_g) {
puts(" Data: Not implemented yet (see values of member");
@@ -1712,6 +1714,8 @@ main (int argc, char *argv[])
} else if (!strcmp(argv[argno], "--help")) {
usage(progname);
exit(0);
+ } else if (!strcmp(argv[argno], "--group")) {
+ grp_literal_g = TRUE;
} else if (!strcmp(argv[argno], "--dump")) {
dump_g = TRUE;
} else if (!strcmp(argv[argno], "--full")) {
@@ -1763,6 +1767,9 @@ main (int argc, char *argv[])
case 'f': /* --full */
fullname_g = TRUE;
break;
+ case 'g': /* --group */
+ grp_literal_g = TRUE;
+ break;
case 'l': /* --label */
label_g = TRUE;
break;
@@ -1813,14 +1820,21 @@ main (int argc, char *argv[])
* If there are no arguments then list `/'.
*/
if (argno>=argc) {
- H5Gget_objinfo(file, "/", TRUE, &sb);
- sym_insert(&sb, "/");
- iter.container = "/";
- H5Giterate(file, "/", NULL, list, &iter);
+ if (grp_literal_g) {
+ root = H5Gopen(file, "/");
+ iter.container = "/";
+ list(root, "/", &iter);
+ H5Gclose(root);
+ } else {
+ H5Gget_objinfo(file, "/", TRUE, &sb);
+ sym_insert(&sb, "/");
+ iter.container = "/";
+ H5Giterate(file, "/", NULL, list, &iter);
+ }
} else {
for (/*void*/; argno<argc; argno++) {
if (H5Gget_objinfo(file, argv[argno], TRUE, &sb)>=0 &&
- H5G_GROUP==sb.type) {
+ H5G_GROUP==sb.type && !grp_literal_g) {
/*
* Specified name is a group. List the complete contents of
* the group.