summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/h5dump/h5dump.c8
-rw-r--r--tools/h5jam/h5jam.c32
-rw-r--r--tools/h5jam/h5unjam.c64
-rw-r--r--tools/h5jam/tellub.c7
-rw-r--r--tools/h5ls/h5ls.c2
-rw-r--r--tools/lib/h5diff.c3
-rw-r--r--tools/misc/h5mkgrp.c2
-rw-r--r--tools/misc/h5stat.c2
8 files changed, 61 insertions, 59 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 555334a..317cdab 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3722,7 +3722,7 @@ main(int argc, const char *argv[])
hid_t fid, gid;
char *fname = NULL;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto2_t func;
find_objs_t info;
struct handler_t *hand;
int i;
@@ -3732,8 +3732,8 @@ main(int argc, const char *argv[])
dump_function_table = &ddl_function_table;
/* Disable error reporting */
- H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Initialize h5tools lib */
h5tools_init();
@@ -3925,7 +3925,7 @@ done:
/* To Do: clean up XML table */
- H5Eset_auto_stack(H5E_DEFAULT, func, edata);
+ H5Eset_auto2(H5E_DEFAULT, func, edata);
leave(d_status);
}
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 559054e..120cde4 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -159,7 +159,7 @@ main (int argc, const char *argv[])
int h5fid;
int ofid;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto2_t func;
hid_t ifile;
hid_t plist;
herr_t status;
@@ -175,8 +175,8 @@ main (int argc, const char *argv[])
int res;
/* Disable error reporting */
- H5Eget_auto_stack (H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack (H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
parse_command_line (argc, argv);
@@ -517,22 +517,22 @@ compute_user_block_size (hsize_t ublock_size)
* Returns the size of the padded file.
*/
hsize_t
-write_pad (int ofile, hsize_t where)
+write_pad(int ofile, hsize_t where)
{
- unsigned int i;
- char buf[1];
- hsize_t psize;
+ unsigned int i;
+ char buf[1];
+ hsize_t psize;
- buf[0] = '\0';
+ buf[0] = '\0';
- HDlseek (ofile, (off_t) where, SEEK_SET);
+ HDlseek(ofile, (off_t) where, SEEK_SET);
- psize = compute_user_block_size (where);
- psize -= where;
+ psize = compute_user_block_size (where);
+ psize -= where;
- for (i = 0; i < psize; i++)
- {
- HDwrite (ofile, buf, 1);
- }
- return (where + psize); /* the new size of the file. */
+ for(i = 0; i < psize; i++)
+ HDwrite (ofile, buf, 1);
+
+ return(where + psize); /* the new size of the file. */
}
+
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 25559e3..0edc980 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -162,7 +162,7 @@ main(int argc, const char *argv[])
int ufid;
int h5fid;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto2_t func;
hid_t ifile;
off_t fsize;
hsize_t usize;
@@ -173,8 +173,8 @@ main(int argc, const char *argv[])
struct stat sbuf;
/* Disable error reporting */
- H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
parse_command_line(argc, argv);
@@ -286,33 +286,33 @@ main(int argc, const char *argv[])
* Returns the size of the output file.
*/
hsize_t
-copy_to_file( int infid, int ofid, ssize_t where, ssize_t how_much ) {
- char buf[1024];
- off_t to;
- off_t from;
- ssize_t nchars = -1;
-
-
- if (how_much <= 0) {
- /* nothing to copy */
- return(where);
- }
- from = where;
- to = 0;
-
- while( how_much > 0) {
- HDlseek(infid,from,SEEK_SET);
- if (how_much > 512) {
- nchars = HDread(infid,buf,(unsigned)512);
- } else {
- nchars = HDread(infid,buf,(unsigned)how_much);
- }
- HDlseek(ofid,to,SEEK_SET);
- HDwrite(ofid,buf,(unsigned)nchars);
- how_much -= nchars;
- from += nchars;
- to += nchars;
- }
-
- return (where+how_much);
+copy_to_file( int infid, int ofid, ssize_t where, ssize_t how_much )
+{
+ char buf[1024];
+ off_t to;
+ off_t from;
+ ssize_t nchars = -1;
+
+ /* nothing to copy */
+ if(how_much <= 0)
+ return(where);
+
+ from = where;
+ to = 0;
+
+ while( how_much > 0) {
+ HDlseek(infid,from,SEEK_SET);
+ if (how_much > 512)
+ nchars = HDread(infid,buf,(unsigned)512);
+ else
+ nchars = HDread(infid,buf,(unsigned)how_much);
+ HDlseek(ofid,to,SEEK_SET);
+ HDwrite(ofid,buf,(unsigned)nchars);
+ how_much -= nchars;
+ from += nchars;
+ to += nchars;
+ }
+
+ return (where + how_much);
}
+
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index e71d4ba..a5d8bbd 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -128,7 +128,7 @@ main (int argc, const char *argv[])
{
char *ifname;
void *edata;
- H5E_auto_stack_t func;
+ H5E_auto2_t func;
hid_t ifile;
hsize_t usize;
htri_t testval;
@@ -136,8 +136,8 @@ main (int argc, const char *argv[])
hid_t plist;
/* Disable error reporting */
- H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
parse_command_line (argc, argv);
@@ -188,3 +188,4 @@ main (int argc, const char *argv[])
return (EXIT_SUCCESS);
}
+
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 6d0da89..d19f200 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2274,7 +2274,7 @@ main (int argc, const char *argv[])
}
/* Turn off HDF5's automatic error printing unless you're debugging h5ls */
- if (!show_errors_g) H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ if (!show_errors_g) H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Each remaining argument is an hdf5 file followed by an optional slash
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index 205f45f..4b354b6 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1143,7 +1143,8 @@ hsize_t diff (hid_t file1_id,
/* If one or both of these links isn't an external link, we can only
* compare information from H5Lget_info since we don't have a query
* function registered for them.
- /* If the link classes or the buffer length are not the
+ *
+ * If the link classes or the buffer length are not the
* same, the links are "different"
*/
if((li1.type != li2.type) || (li1.u.val_size != li2.u.val_size))
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index f2fecbd..c39d07b 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -213,7 +213,7 @@ main(int argc, const char *argv[])
size_t curr_group; /* Current group to create */
/* Disable the HDF5 library's error reporting */
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Initialize h5tools lib */
h5tools_init();
diff --git a/tools/misc/h5stat.c b/tools/misc/h5stat.c
index 8db92c1..93871bd 100644
--- a/tools/misc/h5stat.c
+++ b/tools/misc/h5stat.c
@@ -1201,7 +1201,7 @@ main(int argc, const char *argv[])
int i;
/* Disable error reporting */
- H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
/* Initialize h5tools lib */
h5tools_init();
generated by cgit v0.12 at 2024-11-07 14:29:08 (GMT)