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

* Changed first parameter from int fd to FILE *f in the following functions:

Browse source 
* clixon_xml_parse_file(), clixon_json_parse_file(), yang_parse_file()
  * See [Bytewise read() of files is slow #146](https://github.com/clicon/clixon/issues/146)
This commit is contained in:
Olof hagsand 2020-11-04 22:21:42 +01:00
parent 7a0838da3a
commit c31b1c471b
21 changed files with 113 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

10
util/clixon_util_datastore.c
View file

@ -250,14 +250,14 @@ main(int argc, char **argv)
usage(argv0);
}
if (argc == 2){
int fd;
if ((fd = open(xmlfilename, O_RDONLY)) < 0){
clicon_err(OE_UNIX, errno, "open(%s)", xmlfilename);
FILE *fp;
if ((fp = fopen(xmlfilename, "r")) < 0){
clicon_err(OE_UNIX, errno, "fopen(%s)", xmlfilename);
goto done;
}
if (clixon_xml_parse_file(fd, YB_MODULE, yspec, NULL, &xt, NULL) < 0)
if (clixon_xml_parse_file(fp, YB_MODULE, yspec, NULL, &xt, NULL) < 0)
goto done;
close(fd);
fclose(fp);
}
else
if (clixon_xml_parse_string(argv[2], YB_MODULE, yspec, &xt, NULL) < 0)