git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
json.c
diff --git
a/lib/json.c
b/lib/json.c
index
af385c6
..
56dc5ef
100644
(file)
--- a/
lib/json.c
+++ b/
lib/json.c
@@
-1026,7
+1026,8
@@
json_from_file(const char *file_name)
stream = fopen(file_name, "r");
if (!stream) {
return json_string_create_nocopy(
stream = fopen(file_name, "r");
if (!stream) {
return json_string_create_nocopy(
- xasprintf("error opening \"%s\": %s", file_name, strerror(errno)));
+ xasprintf("error opening \"%s\": %s", file_name,
+ ovs_strerror(errno)));
}
json = json_from_stream(stream);
fclose(stream);
}
json = json_from_stream(stream);
fclose(stream);
@@
-1063,7
+1064,7
@@
json_from_stream(FILE *stream)
if (ferror(stream)) {
json_destroy(json);
json = json_string_create_nocopy(
if (ferror(stream)) {
json_destroy(json);
json = json_string_create_nocopy(
- xasprintf("error reading JSON stream: %s", strerror(errno)));
+ xasprintf("error reading JSON stream: %s",
ovs_
strerror(errno)));
}
return json;
}
return json;