diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 14:07:21 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-10-12 14:07:21 (GMT) |
commit | e8409e6ff14824143456f51c5d4607775a6e16da (patch) | |
tree | b1c45d0c8a7ab313afc768ce257ec50f9fe67063 /tools/h5import | |
parent | 2f2bca0e937b027118c38ff9e590cf805ecf1774 (diff) | |
download | hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.zip hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.tar.gz hdf5-e8409e6ff14824143456f51c5d4607775a6e16da.tar.bz2 |
[svn-r28036] Description:
Bring r27801 & r27809 from trunk to branch
Tested on:
MacOSX/64 10.10.5 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'tools/h5import')
-rw-r--r-- | tools/h5import/h5import.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c index 96fb6f9..9617df3 100644 --- a/tools/h5import/h5import.c +++ b/tools/h5import/h5import.c @@ -265,7 +265,7 @@ err: static int gtoken(char *s) { size_t len; - int token; + int token = ERR; const char *err1 = "Illegal argument: %s.\n"; @@ -995,16 +995,16 @@ out: */ static int processStrHDFData(FILE *strm, struct Input *in, hid_t file_id) { - hid_t group_id; - hid_t dset_id; - hid_t space_id; - hid_t mspace_id; - hid_t type_id; - hid_t handle; - char *str1 = NULL; - char *str2 = NULL; - char *str3 = NULL; - char str[1024] = ""; + hid_t group_id = -1; + hid_t dset_id = -1; + hid_t space_id = -1; + hid_t mspace_id = -1; + hid_t type_id = -1; + hid_t handle = -1; + char *str1 = NULL; + char *str2 = NULL; + char *str3 = NULL; + char str[1024] = ""; int j; hsize_t line; |