summaryrefslogtreecommitdiffstats
path: root/tools/h5jam/h5jam.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-04-12 01:59:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-04-12 01:59:45 (GMT)
commitd6bb18abbc2d6e145afff18446a0814403f1a3b7 (patch)
tree8a340ebde9f0fea052c3d40b6e98f2d0ca7f7aaa /tools/h5jam/h5jam.c
parentde71a7fe74ca0954efec963066e2606d798691f4 (diff)
downloadhdf5-d6bb18abbc2d6e145afff18446a0814403f1a3b7.zip
hdf5-d6bb18abbc2d6e145afff18446a0814403f1a3b7.tar.gz
hdf5-d6bb18abbc2d6e145afff18446a0814403f1a3b7.tar.bz2
[svn-r13648] Description:
Rename new error handling API routines from H5E<foo>_stack() to H5E<foo>2(). Tested on: Mac OS X/32 10.4.9 (amazon) FreeBSD/32 6.2 (duty) FreeBSD/64 6.2 (liberty)
Diffstat (limited to 'tools/h5jam/h5jam.c')
-rw-r--r--tools/h5jam/h5jam.c32
1 files changed, 16 insertions, 16 deletions
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. */
}
+