Prepare for post-2.2.0 (2.2.90).

[sliver-openvswitch.git] / ovsdb / file.h

diff --git a/ovsdb/file.h b/ovsdb/file.h
index 5178140..5d76a73 100644 (file)
--- a/ovsdb/file.h
+++ b/ovsdb/file.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 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.
@@ -16,21 +16,32 @@
 #ifndef OVSDB_FILE_H
 #define OVSDB_FILE_H 1
 
-#include <sys/types.h>
+#include <stdbool.h>
 #include "compiler.h"
+#include "log.h"
 
-struct json;
+struct ovsdb;
 struct ovsdb_file;
+struct ovsdb_schema;
 
-struct ovsdb_error *ovsdb_file_open(const char *name, int flags,
-                                    struct ovsdb_file **) WARN_UNUSED_RESULT;
-void ovsdb_file_close(struct ovsdb_file *);
+struct ovsdb_error *ovsdb_file_open(const char *file_name, bool read_only,
+                                    struct ovsdb **, struct ovsdb_file **)
+    WARN_UNUSED_RESULT;
 
-struct ovsdb_error *ovsdb_file_read(struct ovsdb_file *, struct json **)
+struct ovsdb_error *ovsdb_file_open_as_schema(const char *file_name,
+                                              const struct ovsdb_schema *,
+                                              struct ovsdb **)
     WARN_UNUSED_RESULT;
-struct ovsdb_error *ovsdb_file_write(struct ovsdb_file *, struct json *)
+
+struct ovsdb_error *ovsdb_file_save_copy(const char *file_name, int locking,
+                                         const char *comment,
+                                         const struct ovsdb *)
     WARN_UNUSED_RESULT;
-struct ovsdb_error *ovsdb_file_commit(struct ovsdb_file *)
+
+struct ovsdb_error *ovsdb_file_compact(struct ovsdb_file *);
+
+struct ovsdb_error *ovsdb_file_read_schema(const char *file_name,
+                                           struct ovsdb_schema **)
     WARN_UNUSED_RESULT;
 
 #endif /* ovsdb/file.h */