Couple of srvx updates.

[irc/evilnet/x3.git] / src / saxdb.h

diff --git a/src/saxdb.h b/src/saxdb.h
index a3c76a749f94dae27732d6d986fc2b64e3b6d8b1..09a7179fe68a955b6149603dca66a9ae3eb58ef5 100644 (file)
--- a/src/saxdb.h
+++ b/src/saxdb.h
@@ -26,15 +26,7 @@
 DECLARE_LIST(int_list, int);
 
 struct saxdb;
-/* This definition should ONLY be used so callers of
- * saxdb_open_context() can initialize jbuf properly. */
-struct saxdb_context {
-    FILE *output;
-    unsigned int indent;
-    struct int_list complex;
-    jmp_buf jbuf;
-};
-
+struct saxdb_context;
 
 #define SAXDB_READER(NAME) int NAME(struct dict *db)
 typedef SAXDB_READER(saxdb_reader_func_t);
@@ -46,7 +38,7 @@ void saxdb_init(void);
 void saxdb_finalize(void);
 struct saxdb *saxdb_register(const char *name, saxdb_reader_func_t *reader, saxdb_writer_func_t *writer);
 void saxdb_write(const char *db_name);
-void saxdb_write_all(void);
+void saxdb_write_all(void* extra);
 int write_database(FILE *out, struct dict *db);
 
 /* Callbacks for SAXDB_WRITERs */
@@ -59,6 +51,7 @@ void saxdb_write_sint(struct saxdb_context *dest, const char *name, long value);
 
 /* For doing db writing by hand */
 struct saxdb_context *saxdb_open_context(FILE *f);
-void saxdb_close_context(struct saxdb_context *ctx);
+void saxdb_close_context(struct saxdb_context *ctx, int close_file);
+jmp_buf *saxdb_jmp_buf(struct saxdb_context *ctx);
 
 #endif /* !defined(DBMGR_H) */