[patch] warnings
Nirgal <[email protected]> Thu, 4 Aug 2011 22:51:28 +0000
| Newsgroups | gmane.comp.db.mdb-tools.devel |
|---|---|
| Message-ID | <[email protected]> |
Here's a bunch of fixes for compilation warnings, mostly unused vars. ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ mdbtools-dev mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/mdbtools-dev
warnings.diff
(text/x-patch, 14.1 KB)
Index: mdbtools-0.6pre1/src/libmdb/backend.c
===================================================================
--- mdbtools-0.6pre1.orig/src/libmdb/backend.c
+++ mdbtools-0.6pre1/src/libmdb/backend.c
@@ -230,6 +230,7 @@
* For backends that really do NOT support schema
* returns "name" or "schema_name"
*/
+/*
static gchar*
quote_schema_name_dquote_merge(const gchar* schema, const gchar *name)
{
@@ -240,7 +241,7 @@
return result;
}
return quote_generic(name, '"', '"');
-}
+}*/
static gchar*
quote_schema_name_rquotes_merge(const gchar* schema, const gchar *name)
Index: mdbtools-0.6pre1/src/libmdb/money.c
===================================================================
--- mdbtools-0.6pre1.orig/src/libmdb/money.c
+++ mdbtools-0.6pre1/src/libmdb/money.c
@@ -43,7 +43,7 @@
*/
char *mdb_money_to_string(MdbHandle *mdb, int start)
{
- int num_bytes=8, prec=19, scale=4;
+ int num_bytes=8, scale=4;
int i;
int neg=0;
unsigned char multiplier[MAX_NUMERIC_PRECISION], temp[MAX_NUMERIC_PRECISION];
Index: mdbtools-0.6pre1/src/libmdb/table.c
===================================================================
--- mdbtools-0.6pre1.orig/src/libmdb/table.c
+++ mdbtools-0.6pre1/src/libmdb/table.c
@@ -76,7 +76,7 @@
MdbTableDef *table;
MdbHandle *mdb = entry->mdb;
MdbFormatConstants *fmt = mdb->fmt;
- int len, row_start, pg_row;
+ int row_start, pg_row;
void *buf, *pg_buf = mdb->pg_buf;
guint i;
@@ -85,7 +85,7 @@
return NULL;
table = mdb_alloc_tabledef(entry);
- len = mdb_get_int16(pg_buf, 8);
+ mdb_get_int16(pg_buf, 8); /* len */
table->num_rows = mdb_get_int32(pg_buf, fmt->tab_num_rows_offset);
table->num_var_cols = mdb_get_int16(pg_buf, fmt->tab_num_cols_offset-2);
Index: mdbtools-0.6pre1/src/libmdb/write.c
===================================================================
--- mdbtools-0.6pre1.orig/src/libmdb/write.c
+++ mdbtools-0.6pre1/src/libmdb/write.c
@@ -483,7 +483,7 @@
{
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
- int idx_xref[16];
+ /*int idx_xref[16];*/
unsigned int i, j;
MdbIndexChain *chain;
MdbField idx_fields[10];
@@ -492,7 +492,7 @@
for (j = 0; j < num_fields; j++) {
// key_col_num is 1 based, can't remember why though
if (fields[j].colnum == idx->key_col_num[i]-1) {
- idx_xref[i] = j;
+ /* idx_xref[i] = j; */
idx_fields[i] = fields[j];
}
}
@@ -761,11 +761,10 @@
MdbCatalogEntry *entry = table->entry;
MdbHandle *mdb = entry->mdb;
MdbColumn *col;
- guint32 pg, pg_row;
+ guint32 pg_row;
guint16 row;
void *new_pg;
unsigned char key_hash[256];
- unsigned char iflag;
int keycol;
new_pg = mdb_new_leaf_pg(entry);
@@ -795,9 +794,9 @@
}
pg_row = mdb_get_int32_msb(mdb->pg_buf, ipg->offset + ipg->len - 4);
- pg = pg_row >> 8;
+ /* guint32 pg = pg_row >> 8; */
row = pg_row & 0xff;
- iflag = mdb->pg_buf[ipg->offset];
+ /* unsigned char iflag = mdb->pg_buf[ipg->offset]; */
/* turn the key hash back into a value */
mdb_index_swap_n(&mdb->pg_buf[ipg->offset + 1], col->col_size, key_hash);
Index: mdbtools-0.6pre1/src/odbc/odbc.c
===================================================================
--- mdbtools-0.6pre1.orig/src/odbc/odbc.c
+++ mdbtools-0.6pre1/src/odbc/odbc.c
@@ -79,17 +79,17 @@
} TypeInfo;
TypeInfo type_info[] = {
- {"text", SQL_VARCHAR, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_VARCHAR, NULL, NULL, NULL},
- {"memo", SQL_VARCHAR, 4096, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 4096, SQL_VARCHAR, NULL, NULL, NULL},
- {"text", SQL_CHAR, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_CHAR, NULL, NULL, NULL},
- {"numeric", SQL_NUMERIC, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_NUMERIC, NULL, NULL, NULL},
- {"numeric", SQL_DECIMAL, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_DECIMAL, NULL, NULL, NULL},
- {"long integer", SQL_INTEGER, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_INTEGER, NULL, NULL, NULL},
- {"integer", SQL_SMALLINT, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_SMALLINT, NULL, NULL, NULL},
- {"integer", SQL_SMALLINT, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_SMALLINT, NULL, NULL, NULL},
- {"single", SQL_REAL, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_REAL, NULL, NULL, NULL},
- {"double", SQL_DOUBLE, 8, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 8, SQL_FLOAT, NULL, NULL, NULL},
- {"datetime", SQL_DATETIME, 8, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 8, SQL_DATETIME, NULL, NULL, NULL}
+ {(SQLCHAR*)"text", SQL_VARCHAR, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_VARCHAR, NULL, NULL, NULL},
+ {(SQLCHAR*)"memo", SQL_VARCHAR, 4096, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 4096, SQL_VARCHAR, NULL, NULL, NULL},
+ {(SQLCHAR*)"text", SQL_CHAR, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_CHAR, NULL, NULL, NULL},
+ {(SQLCHAR*)"numeric", SQL_NUMERIC, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_NUMERIC, NULL, NULL, NULL},
+ {(SQLCHAR*)"numeric", SQL_DECIMAL, 255, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_FALSE, NULL, 0, 255, SQL_DECIMAL, NULL, NULL, NULL},
+ {(SQLCHAR*)"long integer", SQL_INTEGER, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_INTEGER, NULL, NULL, NULL},
+ {(SQLCHAR*)"integer", SQL_SMALLINT, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_SMALLINT, NULL, NULL, NULL},
+ {(SQLCHAR*)"integer", SQL_SMALLINT, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_SMALLINT, NULL, NULL, NULL},
+ {(SQLCHAR*)"single", SQL_REAL, 4, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 4, SQL_REAL, NULL, NULL, NULL},
+ {(SQLCHAR*)"double", SQL_DOUBLE, 8, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 8, SQL_FLOAT, NULL, NULL, NULL},
+ {(SQLCHAR*)"datetime", SQL_DATETIME, 8, NULL, NULL, NULL, SQL_TRUE, SQL_TRUE, SQL_TRUE, NULL, SQL_FALSE, SQL_TRUE, NULL, 0, 8, SQL_DATETIME, NULL, NULL, NULL}
};
#define NUM_TYPE_INFO_COLS 19
Index: mdbtools-0.6pre1/src/sql/parser.y
===================================================================
--- mdbtools-0.6pre1.orig/src/sql/parser.y
+++ mdbtools-0.6pre1/src/sql/parser.y
@@ -41,7 +41,7 @@
%token <name> IDENT NAME PATH STRING NUMBER
-%token SELECT FROM WHERE CONNECT DISCONNECT TO LIST TABLES WHERE AND OR NOT
+%token SELECT FROM WHERE CONNECT DISCONNECT TO LIST TABLES AND OR NOT
%token DESCRIBE TABLE
%token LTEQ GTEQ LIKE IS NUL
Index: mdbtools-0.6pre1/src/gmdb2/info.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/info.c
+++ mdbtools-0.6pre1/src/gmdb2/info.c
@@ -71,4 +71,6 @@
gtk_label_set_text(GTK_LABEL(label), tmpstr);
g_free(filepath);
+
+ return propswin_xml;
}
Index: mdbtools-0.6pre1/src/gmdb2/main2.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/main2.c
+++ mdbtools-0.6pre1/src/gmdb2/main2.c
@@ -87,14 +87,6 @@
}
-/* a callback for the buttons */
-static void
-a_callback(GtkWidget *button, gpointer data)
-{
-
- /*just print a string so that we know we got there*/
- g_print("Inside Callback\n");
-}
void
gmdb_help_cb(GtkWidget *button, gpointer data)
{
Index: mdbtools-0.6pre1/src/gmdb2/table.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/table.c
+++ mdbtools-0.6pre1/src/gmdb2/table.c
@@ -137,7 +137,6 @@
gmdb_table_popup_cb (GtkIconView* giv, GdkEvent* event, gpointer data) {
GtkWidget* menu = GTK_WIDGET (data);
GdkEventButton *event_button;
- int num;
if (event->type == GDK_BUTTON_PRESS) {
event_button = (GdkEventButton *) event;
Index: mdbtools-0.6pre1/src/gmdb2/debug.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/debug.c
+++ mdbtools-0.6pre1/src/gmdb2/debug.c
@@ -288,7 +288,6 @@
gmdb_debug_display_cb(GtkWidget *w, gpointer data)
{
int page;
- int i;
GtkWidget *win;
gchar *s;
GladeXML *xml;
@@ -329,7 +328,6 @@
unsigned char *tbuf;
int length;
int i, j;
- off_t pos;
gchar line[80];
gchar field[10];
GtkTextBuffer *buffer;
@@ -349,7 +347,6 @@
gtk_entry_set_text(GTK_ENTRY(entry),pagestr);
g_free(pagestr);
- pos = lseek(mdb->f->fd, 0, SEEK_CUR);
lseek(mdb->f->fd, page * mdb->fmt->pg_size, SEEK_SET);
fbuf = (unsigned char *) g_malloc(mdb->fmt->pg_size);
@@ -468,7 +465,6 @@
gmdb_debug_dissect_index2(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset)
{
gchar *str;
- int mod=0;
unsigned char flags;
str = g_strdup("Column mask");
@@ -503,7 +499,7 @@
str = g_strdup_printf("Row Number: %u", pg_row & 0xff);
gmdb_debug_add_item(store, node, str, offset, 1);
- str = g_strdup_printf("Page Number: %lu", pg_row >> 8);
+ str = g_strdup_printf("Page Number: %u", pg_row >> 8);
gmdb_debug_add_item(store, node, str, offset+1, 3);
}
static void
@@ -1078,7 +1074,7 @@
gboolean *dissect;
pglabel = glade_xml_get_widget (xml, "debug_num_label");
- str = g_strdup_printf("(0-%d):", gmdb_get_max_page(mdb));
+ str = g_strdup_printf("(0-%ld):", gmdb_get_max_page(mdb));
gtk_label_set_text(GTK_LABEL(pglabel), str);
g_free(str);
Index: mdbtools-0.6pre1/src/gmdb2/sql.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/sql.c
+++ mdbtools-0.6pre1/src/gmdb2/sql.c
@@ -48,7 +48,7 @@
GladeXML *xml;
GtkWidget *win;
- while (xml = g_list_nth_data(sql_list, 0)) {
+ while ((xml = g_list_nth_data(sql_list, 0))) {
win = glade_xml_get_widget (xml, "sql_window");
sql_list = g_list_remove(sql_list, xml);
if (win) gtk_widget_destroy(win);
@@ -69,7 +69,7 @@
gchar delimiter[11];
gchar quotechar;
gchar lineterm[5];
- gchar *str, *buf;
+ gchar *str;
int rows=0, n_columns;
GtkWidget *treeview;
GtkTreeViewColumn *col;
@@ -178,9 +178,8 @@
gmdb_sql_results_cb(GtkWidget *w, GladeXML *xml)
{
GladeXML *dialog_xml;
- GtkWidget *but, *label;
+ GtkWidget *but;
GtkWidget *filesel;
- gchar *str;
/* load the interface */
dialog_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-export.glade", NULL, NULL);
@@ -224,7 +223,6 @@
GladeXML *dialog_xml;
GtkWidget *but;
GtkWidget *filesel;
- gchar *str;
/* load the interface */
dialog_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql-file.glade", NULL, NULL);
@@ -246,7 +244,6 @@
GladeXML *dialog_xml;
GtkWidget *but;
GtkWidget *filesel;
- gchar *str;
/* load the interface */
dialog_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql-file.glade", NULL, NULL);
@@ -342,13 +339,11 @@
guint info, guint t,
GladeXML *xml)
{
-gchar *buf;
GtkTextIter iter;
GtkTextBuffer *txtbuffer;
GtkWidget *textview;
textview = glade_xml_get_widget(xml, "sql_textview");
- buf = selection_data->data;
txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
if (gtk_text_buffer_get_char_count(txtbuffer)==0) {
gtk_text_buffer_get_iter_at_offset (txtbuffer, &iter, 0);
@@ -506,7 +501,6 @@
GtkTargetEntry src;
GtkWidget *mi, *but, *combo;
GladeXML *sqlwin_xml;
- GValue value = {0, };
/* load the interface */
sqlwin_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql.glade", NULL, NULL);
@@ -615,6 +609,7 @@
gtk_signal_connect( GTK_OBJECT(textview), "drag_data_received",
GTK_SIGNAL_FUNC(gmdb_sql_dnd_datareceived_cb), sqlwin_xml);
+ //GValue value = {0, };
//but = glade_xml_get_widget(sqlwin_xml, "results_button");
//g_value_init(&value, G_TYPE_STRING);
//g_value_set_static_string(&value, GMDB_ICONDIR "stock_export.png");
@@ -696,7 +691,6 @@
GtkWidget *textview;
GtkTextBuffer *txtbuffer;
GtkTextIter start, end;
- int len;
if (!(in=fopen(file_path, "r"))) {
GtkWidget* dlg = gtk_message_dialog_new (NULL,
Index: mdbtools-0.6pre1/src/gmdb2/table_data.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/table_data.c
+++ mdbtools-0.6pre1/src/gmdb2/table_data.c
@@ -43,7 +43,7 @@
MdbColumn *col;
GtkWidget *clist;
GtkWidget *scroll;
-int i, rownum;
+int i;
long row, maxrow;
gchar *bound_data[256];
GMdbDataWindow *dataw = NULL;
@@ -104,7 +104,7 @@
while(mdb_fetch_row(table) &&
(!maxrow || (row < maxrow))) {
row++;
- rownum = gtk_clist_append(GTK_CLIST(clist), bound_data);
+ gtk_clist_append(GTK_CLIST(clist), bound_data);
}
/* free the memory used to bind */
Index: mdbtools-0.6pre1/src/gmdb2/table_export.c
===================================================================
--- mdbtools-0.6pre1.orig/src/gmdb2/table_export.c
+++ mdbtools-0.6pre1/src/gmdb2/table_export.c
@@ -160,7 +160,6 @@
gchar delimiter[11];
gchar quotechar;
gchar lineterm[5];
-gchar *str;
int rows=0;
GtkWidget *exportwin, *dlg;
@@ -231,9 +230,6 @@
}
void gmdb_table_export(MdbCatalogEntry *entry)
{
-GtkWidget *export_button;
-GtkWidget *close_button;
-
cat_entry = entry;
/* load the interface */
Index: mdbtools-0.6pre1/src/util/mdb-sql.c
===================================================================
--- mdbtools-0.6pre1.orig/src/util/mdb-sql.c
+++ mdbtools-0.6pre1/src/util/mdb-sql.c
@@ -282,11 +282,11 @@
row_count++;
for (j=0;j<sql->num_columns-1;j++) {
sqlcol = g_ptr_array_index(sql->columns,j);
- fprintf(out, "%s%s", sql->bound_values[j],
+ fprintf(out, "%s%s", (char*)(sql->bound_values[j]),
delimiter ? delimiter : "\t");
}
sqlcol = g_ptr_array_index(sql->columns,sql->num_columns-1);
- fprintf(out, "%s", sql->bound_values[sql->num_columns-1]);
+ fprintf(out, "%s", (char*)(sql->bound_values[sql->num_columns-1]));
fprintf(out,"\n");
fflush(out);
}