projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Replicate only tables and columns that are actually needed.
[openvswitch]
/
ovsdb
/
condition.c
diff --git
a/ovsdb/condition.c
b/ovsdb/condition.c
index 0342b8e8906920d2334921a141a7d4cebbb3b15f..59f742c952be91a90600e831819520ee32b7c726 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.
*
* 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;
}
return NULL;
}
-
static WARN_UNUSED_RESULT struct ovsdb_error *
ovsdb_clause_from_json(const struct ovsdb_table_schema *ts,
const struct json *json,
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;
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)
* 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 "
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,
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);
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],
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;
switch (c->function) {
case OVSDB_F_LT:
return cmp < 0;