summaryrefslogtreecommitdiffstats
path: root/tools/h5import
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-03-07 16:09:42 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-03-07 16:09:42 (GMT)
commit22eaae599991804716cfe226859c3679e4494213 (patch)
tree6b77b2793dd9ffde4464541fc0e6346269d5c2e4 /tools/h5import
parent8f5530e3be3e3c53951a0fa64a13d89d674b22d1 (diff)
downloadhdf5-22eaae599991804716cfe226859c3679e4494213.zip
hdf5-22eaae599991804716cfe226859c3679e4494213.tar.gz
hdf5-22eaae599991804716cfe226859c3679e4494213.tar.bz2
[svn-r29309] HDFFV-9698, HDFFV-9241, HDFFV-9570: Merge fixes from trunk for subsetting index, default fill value display, and optional arg crash. Also some minor compiler warnings fixes.
Diffstat (limited to 'tools/h5import')
-rw-r--r--tools/h5import/h5import.c22
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;