X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ovsdb%2Fcolumn.h;h=f75a1076d11ca3fc1cfc2937627a78ce62f6e807;hb=968eec593cc61690c9e0ed97450c4889258381af;hp=b6f324c0f5398ef6adfe2c6e6fcd3151e4862c7d;hpb=2e57b537305cbaa6f724a28957510a6d86aa2d0f;p=cascardo%2Fovs.git

diff --git a/ovsdb/column.h b/ovsdb/column.h
index b6f324c0f..f75a1076d 100644
--- a/ovsdb/column.h
+++ b/ovsdb/column.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010 Nicira Networks
+/* Copyright (c) 2009, 2010, 2011 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 #include "ovsdb-types.h"
 
 struct ovsdb_table;
+struct ovsdb_table_schema;
 
 /* A column or a column schema (currently there is no distinction). */
 struct ovsdb_column {
@@ -52,7 +53,7 @@ void ovsdb_column_destroy(struct ovsdb_column *);
 struct ovsdb_error *ovsdb_column_from_json(const struct json *,
                                            const char *name,
                                            struct ovsdb_column **)
-    WARN_UNUSED_RESULT;
+    OVS_WARN_UNUSED_RESULT;
 struct json *ovsdb_column_to_json(const struct ovsdb_column *);
 
 /* An unordered set of distinct columns. */
@@ -68,10 +69,11 @@ void ovsdb_column_set_init(struct ovsdb_column_set *);
 void ovsdb_column_set_destroy(struct ovsdb_column_set *);
 void ovsdb_column_set_clone(struct ovsdb_column_set *,
                             const struct ovsdb_column_set *);
-struct ovsdb_error *ovsdb_column_set_from_json(const struct json *,
-                                               const struct ovsdb_table *,
-                                               struct ovsdb_column_set *);
+struct ovsdb_error *ovsdb_column_set_from_json(
+    const struct json *, const struct ovsdb_table_schema *,
+    struct ovsdb_column_set *);
 struct json *ovsdb_column_set_to_json(const struct ovsdb_column_set *);
+char *ovsdb_column_set_to_string(const struct ovsdb_column_set *);
 
 void ovsdb_column_set_add(struct ovsdb_column_set *,
                           const struct ovsdb_column *);