diff options
Diffstat (limited to 'tools/h5jam')
| -rw-r--r-- | tools/h5jam/getub.c | 4 | ||||
| -rw-r--r-- | tools/h5jam/h5jam.c | 4 | ||||
| -rw-r--r-- | tools/h5jam/h5jamgentest.c | 17 | ||||
| -rw-r--r-- | tools/h5jam/h5unjam.c | 4 | ||||
| -rw-r--r-- | tools/h5jam/tellub.c | 16 |
5 files changed, 23 insertions, 22 deletions
diff --git a/tools/h5jam/getub.c b/tools/h5jam/getub.c index 58e9fe8..01756a5 100644 --- a/tools/h5jam/getub.c +++ b/tools/h5jam/getub.c @@ -27,7 +27,7 @@ void parse_command_line (int argc, const char *argv[]); #define TRUE 1 #define FALSE 0 -static char *progname="getub"; +static const char *progname="getub"; char *nbytes = NULL; static const char *s_opts = "c:"; /* add more later ? */ @@ -153,7 +153,7 @@ main (int argc, const char *argv[]) res = HDread (fd, buf, (unsigned)size); - if (res < size) + if (res < (long)size) { if (buf) free (buf); diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index d78e28c..7d3301b 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -442,7 +442,7 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout, } else { - nchars = HDread (infid, buf, howmuch); + nchars = HDread (infid, buf, (unsigned)howmuch); } if (nchars <= 0) @@ -498,7 +498,7 @@ copy_some_to_file (int infid, int outfid, hsize_t startin, hsize_t startout, hsize_t compute_user_block_size (hsize_t ublock_size) { - ssize_t where = 512; + hsize_t where = 512; if (ublock_size == 0) return 0; diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c index 7f6342f..2d5f253 100644 --- a/tools/h5jam/h5jamgentest.c +++ b/tools/h5jam/h5jamgentest.c @@ -262,12 +262,13 @@ hsize_t dims[2]; int data[2][2], dset1[10][10], dset2[20]; char buf[512]; int i, j; +unsigned u; float dset2_1[10], dset2_2[3][5]; int fd; char *bp; create_plist = H5Pcreate(H5P_FILE_CREATE); - H5Pset_userblock(create_plist,512); + H5Pset_userblock(create_plist,(hsize_t)512); fid = H5Fcreate(FILE8, H5F_ACC_TRUNC, create_plist, H5P_DEFAULT); /* create groups */ @@ -390,8 +391,8 @@ char *bp; /* fill buf with pattern */ memset(buf,'\0',512); bp = buf; - for (i = 0; i < strlen(pattern); i++) { - *bp++ = pattern[i%10]; + for (u = 0; u < strlen(pattern); u++) { + *bp++ = pattern[u%10]; } HDwrite(fd,buf,512); @@ -411,7 +412,7 @@ int fd; char *bp; create_plist = H5Pcreate(H5P_FILE_CREATE); - H5Pset_userblock(create_plist,1024); + H5Pset_userblock(create_plist,(hsize_t)1024); fid = H5Fcreate(FILE9, H5F_ACC_TRUNC, create_plist, H5P_DEFAULT); /* create groups */ @@ -543,14 +544,14 @@ char *bp; close(fd); } -void -create_textfile(char *name, off_t size) { +static void +create_textfile(const char *name, size_t size) { char *buf; int fd; -int i; +size_t i; char *bp; - fd = creat(name,0777); + fd = creat(name,(mode_t)0777); if (fd < 0) { /* panic */ } diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c index 20378e5..ad54e5e 100644 --- a/tools/h5jam/h5unjam.c +++ b/tools/h5jam/h5unjam.c @@ -100,7 +100,7 @@ usage(const char *prog) *------------------------------------------------------------------------- */ -void +static void parse_command_line(int argc, const char *argv[]) { int opt = FALSE; @@ -268,7 +268,7 @@ main(int argc, const char *argv[]) /* copy from usize to end of file into h5fid, * starting at end of user block if present */ - copy_to_file( ifid, h5fid, (ssize_t) usize, (fsize - (ssize_t)usize) ); + copy_to_file( ifid, h5fid, (ssize_t) usize, (ssize_t)(fsize - (ssize_t)usize) ); close(ufid); diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c index ab88f4d..75f4a64 100644 --- a/tools/h5jam/tellub.c +++ b/tools/h5jam/tellub.c @@ -79,7 +79,7 @@ usage (const char *prog) *------------------------------------------------------------------------- */ -void +static void parse_command_line (int argc, const char *argv[]) { int opt = FALSE; @@ -122,7 +122,7 @@ parse_command_line (int argc, const char *argv[]) * *------------------------------------------------------------------------- */ -void +int main (int argc, const char *argv[]) { char *ifname; @@ -144,7 +144,7 @@ main (int argc, const char *argv[]) { error_msg (progname, "missing file name\n"); usage (progname); - exit (EXIT_FAILURE); + return (EXIT_FAILURE); } ifname = strdup (argv[opt_ind]); @@ -154,7 +154,7 @@ main (int argc, const char *argv[]) if (testval <= 0) { error_msg (progname, "Input HDF5 file is not HDF \"%s\"\n", ifname); - exit (EXIT_FAILURE); + return (EXIT_FAILURE); } ifile = H5Fopen (ifname, H5F_ACC_RDONLY, H5P_DEFAULT); @@ -162,7 +162,7 @@ main (int argc, const char *argv[]) if (ifile < 0) { error_msg (progname, "Can't open input HDF5 file \"%s\"\n", ifname); - exit (EXIT_FAILURE); + return (EXIT_FAILURE); } plist = H5Fget_create_plist (ifile); @@ -170,14 +170,14 @@ main (int argc, const char *argv[]) { error_msg (progname, "Can't get file creation plist for file \"%s\"\n", ifname); - exit (EXIT_FAILURE); + return (EXIT_FAILURE); } status = H5Pget_userblock (plist, &usize); if (status < 0) { error_msg (progname, "Can't get user block for file \"%s\"\n", ifname); - exit (EXIT_FAILURE); + return (EXIT_FAILURE); } printf ("%ld\n", (long) usize); @@ -185,5 +185,5 @@ main (int argc, const char *argv[]) H5Pclose (plist); H5Fclose (ifile); - exit (EXIT_SUCCESS); + return (EXIT_SUCCESS); } |