experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/clicon/clixon

Browse source
This commit is contained in:
Olof hagsand 2019-05-10 16:56:07 +02:00
commit f8850990d4
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/src/clixon_datastore_tree.c
View file

@ -206,6 +206,7 @@ buf2xml(FILE *f,
int i; int i;
uint32_t ind; uint32_t ind;
cxobj *xc; cxobj *xc;
size_t ret;
/* Read hdr /* Read hdr
* +-----+-----+-----+-----+-----+-----+-----+-----+ * +-----+-----+-----+-----+-----+-----+-----+-----+
@ -216,7 +217,7 @@ buf2xml(FILE *f,
clicon_err(OE_UNIX, errno, "fseek"); clicon_err(OE_UNIX, errno, "fseek");
goto done; goto done;
} }
if (fread(hdr, sizeof(char), sizeof(hdr), f) < 0){ if ((ret = fread(hdr, sizeof(char), sizeof(hdr), f)) != sizeof(hdr)){
clicon_err(OE_XML, errno, "fread"); clicon_err(OE_XML, errno, "fread");
goto done; goto done;
} }
@ -250,7 +251,7 @@ buf2xml(FILE *f,
clicon_err(OE_UNIX, errno, "malloc"); clicon_err(OE_UNIX, errno, "malloc");
goto done; goto done;
} }
if (fread(buf, sizeof(char), len-sizeof(hdr), f) < 0){ if ((ret = fread(buf, sizeof(char), len-sizeof(hdr), f)) != len-sizeof(hdr)){
clicon_err(OE_XML, errno, "fread"); clicon_err(OE_XML, errno, "fread");
goto done; goto done;
} }
@ -318,7 +319,7 @@ xml2buf(FILE *f,
int len1; int len1;
int ptr; int ptr;
int i; int i;
char *buf0; char *buf0 = NULL;
char *buf; char *buf;
uint32_t myindex; uint32_t myindex;