Description: Don't use C++ reserved keyword namespace in headers
Author: Jean-Michel Vourgère <jmv_deb@nirgal.com>

Origin: upstream, https://github.com/brianb/mdbtools/commit/7634e329c740825c97652175bcad16a1a58688ae
Forwarded: not-needed
Last-Update: 2012-02-11
Index: mdbtools/include/mdbtools.h
===================================================================
--- mdbtools.orig/include/mdbtools.h
+++ mdbtools/include/mdbtools.h
@@ -492,7 +492,7 @@
 extern void mdb_register_backend(char *backend_name, guint32 capabilities, MdbBackendType *backend_type, MdbBackendType *type_shortdate, MdbBackendType *type_autonum, const char *short_now, const char *long_now, const char *charset_statement, const char *drop_statement, const char *constaint_not_empty_statement, const char *column_comment_statement, const char *table_comment_statement, gchar* (*quote_schema_name)(const gchar*, const gchar*));
 extern void mdb_remove_backends();
 extern int  mdb_set_default_backend(MdbHandle *mdb, const char *backend_name);
-extern void mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *namespace, guint32 export_options);
+extern void mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *dbnamespace, guint32 export_options);
 
 /* sargs.c */
 extern int mdb_test_sargs(MdbTableDef *table, MdbField *fields, int num_fields);
Index: mdbtools/src/libmdb/backend.c
===================================================================
--- mdbtools.orig/src/libmdb/backend.c
+++ mdbtools/src/libmdb/backend.c
@@ -427,9 +427,10 @@
  * mdb_print_indexes
  * @output: Where to print the sql
  * @table: Table to process
+ * @dbnamespace: Target namespace/schema name
  */
 static void
-mdb_print_indexes(FILE* outfile, MdbTableDef *table, char *namespace)
+mdb_print_indexes(FILE* outfile, MdbTableDef *table, char *dbnamespace)
 {
 	unsigned int i, j;
 	char* quoted_table_name;
@@ -449,7 +450,7 @@
 
 	fprintf (outfile, "-- CREATE INDEXES ...\n");
 
-	quoted_table_name = mdb->default_backend->quote_schema_name(namespace, table->name);
+	quoted_table_name = mdb->default_backend->quote_schema_name(dbnamespace, table->name);
 
 	for (i=0;i<table->num_idxs;i++) {
 		idx = g_ptr_array_index (table->indices, i);
@@ -465,7 +466,7 @@
 			strcat(index_name, idx->name);
 			strcat(index_name, "_idx");
 		}
-		quoted_name = mdb->default_backend->quote_schema_name(namespace, index_name);
+		quoted_name = mdb->default_backend->quote_schema_name(dbnamespace, index_name);
 		if (idx->index_type==1) {
 			fprintf (outfile, "ALTER TABLE %s ADD CONSTRAINT %s PRIMARY KEY (", quoted_table_name, quoted_name);
 		} else {
@@ -514,7 +515,7 @@
  *   The caller is responsible for freeing this string.
  */
 static char *
-mdb_get_relationships(MdbHandle *mdb, const gchar *namespace, const char* tablename)
+mdb_get_relationships(MdbHandle *mdb, const gchar *dbnamespace, const char* tablename)
 {
 	unsigned int i;
 	gchar *text = NULL;  /* String to be returned */
@@ -585,13 +586,13 @@
 			break;
 	}
 
-	quoted_table_1 = mdb->default_backend->quote_schema_name(namespace, bound[1]);
-	quoted_column_1 = mdb->default_backend->quote_schema_name(namespace, bound[0]);
-	quoted_table_2 = mdb->default_backend->quote_schema_name(namespace, bound[3]);
-	quoted_column_2 = mdb->default_backend->quote_schema_name(namespace, bound[2]);
+	quoted_table_1 = mdb->default_backend->quote_schema_name(dbnamespace, bound[1]);
+	quoted_column_1 = mdb->default_backend->quote_schema_name(dbnamespace, bound[0]);
+	quoted_table_2 = mdb->default_backend->quote_schema_name(dbnamespace, bound[3]);
+	quoted_column_2 = mdb->default_backend->quote_schema_name(dbnamespace, bound[2]);
 	grbit = atoi(bound[4]);
 	constraint_name = g_strconcat(bound[1], "_", bound[0], "_fk", NULL);
-	quoted_constraint_name = mdb->default_backend->quote_schema_name(namespace, constraint_name);
+	quoted_constraint_name = mdb->default_backend->quote_schema_name(dbnamespace, constraint_name);
 	free(constraint_name);
 
 	if (grbit & 0x00000002) {
@@ -626,7 +627,7 @@
 }
 
 static void
-generate_table_schema(FILE *outfile, MdbCatalogEntry *entry, char *namespace, guint32 export_options)
+generate_table_schema(FILE *outfile, MdbCatalogEntry *entry, char *dbnamespace, guint32 export_options)
 {
 	MdbTableDef *table;
 	MdbHandle *mdb = entry->mdb;
@@ -637,7 +638,7 @@
 	MdbProperties *props;
 	const char *prop_value;
 
-	quoted_table_name = mdb->default_backend->quote_schema_name(namespace, entry->object_name);
+	quoted_table_name = mdb->default_backend->quote_schema_name(dbnamespace, entry->object_name);
 
 	/* drop the table if it exists */
 	if (export_options & MDB_SHEXP_DROPTABLE)
@@ -773,7 +774,7 @@
 
 	if (export_options & MDB_SHEXP_INDEXES)
 		// prints all the indexes of that table
-		mdb_print_indexes(outfile, table, namespace);
+		mdb_print_indexes(outfile, table, dbnamespace);
 
 	free(quoted_table_name);
 
@@ -782,7 +783,7 @@
 
 
 void
-mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *namespace, guint32 export_options)
+mdb_print_schema(MdbHandle *mdb, FILE *outfile, char *tabname, char *dbnamespace, guint32 export_options)
 {
 	unsigned int   i;
 	char		*the_relation;
@@ -813,7 +814,7 @@
 		if (entry->object_type == MDB_TABLE) {
 			if ((tabname && !strcmp(entry->object_name, tabname))
 			 || (!tabname && mdb_is_user_table(entry))) {
-				generate_table_schema(outfile, entry, namespace, export_options);
+				generate_table_schema(outfile, entry, dbnamespace, export_options);
 			}
 		}
 	}
@@ -821,7 +822,7 @@
 
 	if (export_options & MDB_SHEXP_RELATIONS) {
 		fputs ("-- CREATE Relationships ...\n", outfile);
-		while ((the_relation=mdb_get_relationships(mdb, namespace, tabname)) != NULL) {
+		while ((the_relation=mdb_get_relationships(mdb, dbnamespace, tabname)) != NULL) {
 			fputs(the_relation, outfile);
 			g_free(the_relation);
 		}
