summaryrefslogtreecommitdiff
path: root/utilities
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2011-02-28 12:43:15 -0800
committerBen Pfaff <blp@nicira.com>2011-03-10 11:24:00 -0800
commite9387de4a2601ed2768baaa9bc92a3ef27f1145a (patch)
tree93b454fb139b59c0c5959d8dca313b33139ac67c /utilities
parent71abd20a1789fb10a7a346ca1a029a76e3f10041 (diff)
downloadopenvswitch-e9387de4a2601ed2768baaa9bc92a3ef27f1145a.tar.gz
ovsdb-data: Rename 'used' to 'created' in struct ovsdb_symbol.
The name 'created' better reflects the actual meaning of this member: in both ovsdb and ovs-vsctl, it is true if a row has been created with the symbol's UUID and false otherwise.
Diffstat (limited to 'utilities')
-rw-r--r--utilities/ovs-vsctl.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 5de5f926a..2818a38f7 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -2365,11 +2365,11 @@ create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp)
}
symbol = ovsdb_symbol_table_insert(symtab, id);
- if (symbol->used) {
+ if (symbol->created) {
vsctl_fatal("row id \"%s\" may only be specified on one --id option",
id);
}
- symbol->used = true;
+ symbol->created = true;
return &symbol->uuid;
}
@@ -3354,7 +3354,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
const struct ovsrec_open_vswitch *ovs;
enum ovsdb_idl_txn_status status;
struct ovsdb_symbol_table *symtab;
- const char *unused;
+ const char *uncreated;
struct vsctl_command *c;
int64_t next_cfg = 0;
char *error = NULL;
@@ -3395,10 +3395,10 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands,
}
}
- unused = ovsdb_symbol_table_find_unused(symtab);
- if (unused) {
+ uncreated = ovsdb_symbol_table_find_uncreated(symtab);
+ if (uncreated) {
vsctl_fatal("row id \"%s\" is referenced but never created (e.g. "
- "with \"-- --id=%s create ...\")", unused, unused);
+ "with \"-- --id=%s create ...\")", uncreated, uncreated);
}
status = ovsdb_idl_txn_commit_block(txn);