X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fcolumn.h;h=60ba478af9f42cf02b0e5bef2ab917393269aa7a;hb=HEAD;hp=b6f324c0f5398ef6adfe2c6e6fcd3151e4862c7d;hpb=5f55c39b21e69025045437ffbd3bb98fe6ce2e89;p=sliver-openvswitch.git diff --git a/ovsdb/column.h b/ovsdb/column.h index b6f324c0f..60ba478af 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 { @@ -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 *);