mdbtools/mdbtools-0.6pre1-ooo.patch

82 lines
3.1 KiB
Diff

diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/gmdb.h mdbtools-0.6pre1/src/gmdb2/gmdb.h
--- mdbtools-0.6pre1.orig/src/gmdb2/gmdb.h 2004-02-11 23:04:26.000000000 +0100
+++ mdbtools-0.6pre1/src/gmdb2/gmdb.h 2007-11-07 16:39:17.000000000 +0100
@@ -24,6 +24,7 @@
GtkWidget *gmdb_table_def_new(MdbCatalogEntry *entry);
GtkWidget *gmdb_table_export_new(MdbCatalogEntry *entry);
void gmdb_table_export(MdbCatalogEntry *entry) ;
+gchar *gmdb_export_get_filepath(GladeXML *xml);
void gmdb_file_select_cb(GtkWidget *w, gpointer data);
void gmdb_file_open_cb(GtkWidget *w, gpointer data);
diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/info.c mdbtools-0.6pre1/src/gmdb2/info.c
--- mdbtools-0.6pre1.orig/src/gmdb2/info.c 2003-01-12 23:59:42.000000000 +0100
+++ mdbtools-0.6pre1/src/gmdb2/info.c 2007-11-07 16:37:20.000000000 +0100
@@ -71,4 +71,7 @@
gtk_label_set_text(GTK_LABEL(label), tmpstr);
g_free(filepath);
+ // a hack to avoid warning: control reaches end of non-void function
+ // the return value is nowhere used anyway
+ return NULL;
}
diff -Nru mdbtools-0.6pre1.orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
--- mdbtools-0.6pre1.orig/src/gmdb2/table_export.c 2003-01-14 18:37:44.000000000 +0100
+++ mdbtools-0.6pre1/src/gmdb2/table_export.c 2007-11-07 16:39:27.000000000 +0100
@@ -49,6 +49,7 @@
}
}
+void
gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf)
{
GtkWidget *combo;
diff -Nru mdbtools-0.6pre1.orig/src/libmdb/backend.c mdbtools-0.6pre1/src/libmdb/backend.c
--- mdbtools-0.6pre1.orig/src/libmdb/backend.c 2004-06-11 15:56:41.000000000 +0200
+++ mdbtools-0.6pre1/src/libmdb/backend.c 2007-11-07 16:37:20.000000000 +0100
@@ -28,7 +28,7 @@
#endif
static int is_init;
-static GHashTable *mdb_backends;
+GHashTable *mdb_backends;
/* Access data types */
static MdbBackendType mdb_access_types[] = {
diff -Nru mdbtools-0.6pre1.orig/src/libmdb/index.c mdbtools-0.6pre1/src/libmdb/index.c
--- mdbtools-0.6pre1.orig/src/libmdb/index.c 2004-04-16 17:45:14.000000000 +0200
+++ mdbtools-0.6pre1/src/libmdb/index.c 2007-11-07 16:37:20.000000000 +0100
@@ -330,7 +330,7 @@
{
int mask_bit = 0;
int mask_pos = 0x16;
- int mask_byte;
+ int mask_byte = 0;
int elem = 0;
int len, start, i;
diff -Nru mdbtools-0.6pre1.orig/src/libmdb/kkd.c mdbtools-0.6pre1/src/libmdb/kkd.c
--- mdbtools-0.6pre1.orig/src/libmdb/kkd.c 2003-04-29 19:55:17.000000000 +0200
+++ mdbtools-0.6pre1/src/libmdb/kkd.c 2007-11-07 16:37:20.000000000 +0100
@@ -55,7 +55,7 @@
GHashTable *mdb_get_column_def(MdbCatalogEntry *entry, int start)
{
-GHashTable *hash;
+GHashTable *hash = NULL;
MdbHandle *mdb = entry->mdb;
MdbColumnProp prop;
int tmp, pos, col_num, val_len, i;
diff -Nru mdbtools-0.6pre1.orig/src/sql/mdbsql.c mdbtools-0.6pre1/src/sql/mdbsql.c
--- mdbtools-0.6pre1.orig/src/sql/mdbsql.c 2004-05-30 07:50:40.000000000 +0200
+++ mdbtools-0.6pre1/src/sql/mdbsql.c 2007-11-07 16:40:25.000000000 +0100
@@ -84,7 +84,7 @@
return 1;
}
}
-int mdb_run_query(MdbSQL *sql, char *query)
+int mdb_sql_run_query(MdbSQL *sql, char *query)
{
if (_parse(sql,query) && sql->cur_table) {
mdb_sql_bind_all(sql);