X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=lib%2Fovsdb-parser.c;h=3e448332bc47eaa020965eddc65e09cdb22447ce;hb=ca7e7bee86b4ee821d61b58bf15c89a9d8a3cb30;hp=d923d21a88897f48f20c206f4f0d758f424a814f;hpb=f85f8ebbfac946c19b3c6eb0f4170f579d0a4d25;p=cascardo%2Fovs.git

diff --git a/lib/ovsdb-parser.c b/lib/ovsdb-parser.c
index d923d21a8..3e448332b 100644
--- a/lib/ovsdb-parser.c
+++ b/lib/ovsdb-parser.c
@@ -1,4 +1,4 @@
-/* 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.
@@ -32,7 +32,7 @@ ovsdb_parser_init(struct ovsdb_parser *parser, const struct json *json,
     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);
@@ -41,8 +41,8 @@ ovsdb_parser_init(struct ovsdb_parser *parser, const struct json *json,
     }
 }
 
-static bool
-is_id(const char *string)
+bool
+ovsdb_parser_is_id(const char *string)
 {
     unsigned char c;
 
@@ -80,13 +80,12 @@ ovsdb_parser_member(struct ovsdb_parser *parser, const char *name,
         return NULL;
     }
 
-    if (value->type >= 0 && value->type < JSON_N_TYPES
-        && (types & (1u << value->type)
-            || (types & OP_ID
-                && value->type == JSON_STRING
-                && is_id(value->u.string))))
+    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'.",
@@ -127,6 +126,15 @@ ovsdb_parser_has_error(const struct ovsdb_parser *parser)
     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)
 {
@@ -134,18 +142,16 @@ 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 {
@@ -160,8 +166,5 @@ ovsdb_parser_finish(struct ovsdb_parser *parser)
         }
     }
 
-    free(parser->name);
-    svec_destroy(&parser->used);
-
-    return parser->error;
+    return ovsdb_parser_destroy(parser);
 }