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
sliver-ovs: ignore pid files when starting servers
[sliver-openvswitch.git]
/
lib
/
json.c
diff --git
a/lib/json.c
b/lib/json.c
index
af385c6
..
db0e09e
100644
(file)
--- a/
lib/json.c
+++ b/
lib/json.c
@@
-355,7
+355,7
@@
json_destroy(struct json *json)
break;
case JSON_N_TYPES:
break;
case JSON_N_TYPES:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
free(json);
}
}
free(json);
}
@@
-417,7
+417,7
@@
json_clone(const struct json *json)
case JSON_N_TYPES:
default:
case JSON_N_TYPES:
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
@@
-502,7
+502,7
@@
json_hash(const struct json *json, size_t basis)
case JSON_N_TYPES:
default:
case JSON_N_TYPES:
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
@@
-573,7
+573,7
@@
json_equal(const struct json *a, const struct json *b)
case JSON_N_TYPES:
default:
case JSON_N_TYPES:
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
\f
}
}
\f
@@
-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;
@@
-1174,7
+1175,7
@@
json_parser_put_value(struct json_parser *p, struct json *value)
} else if (node->json->type == JSON_ARRAY) {
json_array_add(node->json, value);
} else {
} else if (node->json->type == JSON_ARRAY) {
json_array_add(node->json, value);
} else {
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
@@
-1294,7
+1295,7
@@
json_parser_pop(struct json_parser *p)
} else if (node->json->type == JSON_OBJECT) {
p->parse_state = JSON_PARSE_OBJECT_NEXT;
} else {
} else if (node->json->type == JSON_OBJECT) {
p->parse_state = JSON_PARSE_OBJECT_NEXT;
} else {
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
}
}
@@
-1501,7
+1502,7
@@
json_serialize(const struct json *json, struct json_serializer *s)
case JSON_N_TYPES:
default:
case JSON_N_TYPES:
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}
@@
-1749,6
+1750,6
@@
json_serialized_length(const struct json *json)
case JSON_N_TYPES:
default:
case JSON_N_TYPES:
default:
- NOT_REACHED();
+
OVS_
NOT_REACHED();
}
}
}
}