-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2011, 2013, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
parser->name = xvasprintf(name, args);
va_end(args);
- svec_init(&parser->used);
+ sset_init(&parser->used);
parser->error = NULL;
parser->json = (json && json->type == JSON_OBJECT ? json : NULL);
return NULL;
}
- if ((value->type >= 0 && value->type < JSON_N_TYPES
+ if (((int) value->type >= 0 && value->type < JSON_N_TYPES
&& types & (1u << value->type))
|| (types & OP_ID && value->type == JSON_STRING
&& ovsdb_parser_is_id(value->u.string)))
{
- svec_add(&parser->used, name);
+ sset_add(&parser->used, name);
return value;
} else {
ovsdb_parser_raise_error(parser, "Type mismatch for member '%s'.",
return parser->error != NULL;
}
+struct ovsdb_error *
+ovsdb_parser_destroy(struct ovsdb_parser *parser)
+{
+ free(parser->name);
+ sset_destroy(&parser->used);
+
+ return parser->error;
+}
+
struct ovsdb_error *
ovsdb_parser_finish(struct ovsdb_parser *parser)
{
const struct shash *object = json_object(parser->json);
size_t n_unused;
- /* XXX this method of detecting unused members can be made cheaper */
- svec_sort_unique(&parser->used);
- n_unused = shash_count(object) - parser->used.n;
+ n_unused = shash_count(object) - sset_count(&parser->used);
if (n_unused) {
struct shash_node *node;
SHASH_FOR_EACH (node, object) {
- if (!svec_contains(&parser->used, node->name)) {
+ if (!sset_contains(&parser->used, node->name)) {
if (n_unused > 1) {
ovsdb_parser_raise_error(
parser,
- "Member '%s' and %zu other member%s "
+ "Member '%s' and %"PRIuSIZE" other member%s "
"are present but not allowed here.",
node->name, n_unused - 1, n_unused > 2 ? "s" : "");
} else {
}
}
- free(parser->name);
- svec_destroy(&parser->used);
-
- return parser->error;
+ return ovsdb_parser_destroy(parser);
}