Prepare Open vSwitch 1.1.2 release.

[sliver-openvswitch.git] / ovsdb / condition.c

diff --git a/ovsdb/condition.c b/ovsdb/condition.c
index 0342b8e..59f742c 100644 (file)
--- a/ovsdb/condition.c
+++ b/ovsdb/condition.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,10 @@ ovsdb_function_to_string(enum ovsdb_function function)
     return NULL;
 }
 
-
 static WARN_UNUSED_RESULT struct ovsdb_error *
 ovsdb_clause_from_json(const struct ovsdb_table_schema *ts,
                        const struct json *json,
-                       const struct ovsdb_symbol_table *symtab,
+                       struct ovsdb_symbol_table *symtab,
                        struct ovsdb_clause *clause)
 {
     const struct json_array *array;
@@ -98,8 +97,8 @@ ovsdb_clause_from_json(const struct ovsdb_table_schema *ts,
          * n_max == 1?  (They would always be "false" if the value was
          * missing.) */
         if (!ovsdb_type_is_scalar(&type)
-            || (type.key_type != OVSDB_TYPE_INTEGER
-                && type.key_type != OVSDB_TYPE_REAL)) {
+            || (type.key.type != OVSDB_TYPE_INTEGER
+                && type.key.type != OVSDB_TYPE_REAL)) {
             char *s = ovsdb_type_to_english(&type);
             error = ovsdb_syntax_error(
                 json, NULL, "Type mismatch: \"%s\" operator may not be "
@@ -168,7 +167,7 @@ compare_clauses_3way(const void *a_, const void *b_)
 struct ovsdb_error *
 ovsdb_condition_from_json(const struct ovsdb_table_schema *ts,
                           const struct json *json,
-                          const struct ovsdb_symbol_table *symtab,
+                          struct ovsdb_symbol_table *symtab,
                           struct ovsdb_condition *cnd)
 {
     const struct json_array *array = json_array(json);
@@ -232,7 +231,7 @@ ovsdb_condition_evaluate(const struct ovsdb_row *row,
 
         if (ovsdb_type_is_scalar(type)) {
             int cmp = ovsdb_atom_compare_3way(&field->keys[0], &arg->keys[0],
-                                              type->key_type);
+                                              type->key.type);
             switch (c->function) {
             case OVSDB_F_LT:
                 return cmp < 0;