lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 15:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix various warnings

Browse Source
This commit is contained in:
whydoubt 2005-01-05 13:48:34 +00:00
parent f09f9438d3
commit c1e36db86f
17 changed files with 166 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChangeLog
View File

@ -1,3 +1,21 @@
Wed Jan 5 07:43:07 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/gmdb2/debug.c:
* src/gmdb2/file.c:
* src/gmdb2/form.c:
* src/gmdb2/gmdb.h:
* src/gmdb2/macro.c:
* src/gmdb2/main2.c:
* src/gmdb2/module.c:
* src/gmdb2/prefs.c:
* src/gmdb2/query.c:
* src/gmdb2/report.c:
* src/gmdb2/schema.c:
* src/gmdb2/sql.c:
* src/gmdb2/table.c:
* src/gmdb2/table_data.c:
* src/gmdb2/table_def.c:
* src/gmdb2/table_export.c: Fix various warnings
Thu Dec 30 19:26:01 CST 2004 Jeff Smith <whydoubt@yahoo.com> Thu Dec 30 19:26:01 CST 2004 Jeff Smith <whydoubt@yahoo.com>
* HACKING: * HACKING:
* doc/reference/libmdb/libmdb-sections.txt: * doc/reference/libmdb/libmdb-sections.txt:

67
src/gmdb2/debug.c
View File

@ -32,15 +32,15 @@ GList *debug_list = NULL;
static void gmdb_debug_init(MdbHandle *mdb, GladeXML *xml); static void gmdb_debug_init(MdbHandle *mdb, GladeXML *xml);
static void gmdb_debug_text_on(GtkWidget *textbox, int start_byte, int end_byte); static void gmdb_debug_text_on(GtkWidget *textbox, int start_byte, int end_byte);
static void gmdb_debug_text_off(GtkWidget *textbox); static void gmdb_debug_text_off(GtkWidget *textbox);
GtkTreeIter *gmdb_debug_add_item(GtkTreeStore *store, GtkTreeIter *iter, gchar *text, int start, int end); static GtkTreeIter *gmdb_debug_add_item(GtkTreeStore *store, GtkTreeIter *iter, gchar *text, int start, int end);
static void gmdb_debug_clear(GladeXML *xml); static void gmdb_debug_clear(GladeXML *xml);
void gmdb_debug_dissect(GtkTreeStore *store, char *fbuf, int offset, int len); static void gmdb_debug_dissect(GtkTreeStore *store, char *fbuf, int offset, int len);
static guint16 get_uint16(unsigned char *c); static guint16 get_uint16(unsigned char *c);
static guint32 get_uint24(unsigned char *c); static guint32 get_uint24(unsigned char *c);
static guint32 get_uint32(unsigned char *c); static guint32 get_uint32(unsigned char *c);
static long gmdb_get_max_page(MdbHandle *mdb); static long gmdb_get_max_page(MdbHandle *mdb);
void gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml); static void gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml);
void gmdb_debug_display(GladeXML *xml, guint32 page); static void gmdb_debug_display(GladeXML *xml, guint32 page);
/* value to string stuff */ /* value to string stuff */
typedef struct GMdbValStr { typedef struct GMdbValStr {
@ -78,8 +78,9 @@ GMdbValStr object_types[] = {
{ 0x04, "Leaf Index Page" }, { 0x04, "Leaf Index Page" },
{ 0, NULL } { 0, NULL }
}; };
/* callbacks */ /* callbacks */
void static void
gmdb_debug_select_cb(GtkTreeSelection *select, GladeXML *xml) gmdb_debug_select_cb(GtkTreeSelection *select, GladeXML *xml)
{ {
int start_row, end_row; int start_row, end_row;
@ -139,7 +140,7 @@ GtkWidget *textview;
LINESZ * end_row + 59 + (end % 16) + 1); LINESZ * end_row + 59 + (end % 16) + 1);
} }
} }
void static void
gmdb_debug_forward_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_forward_cb(GtkWidget *w, GladeXML *xml)
{ {
guint *nav_elem; guint *nav_elem;
@ -162,7 +163,7 @@ gmdb_debug_forward_cb(GtkWidget *w, GladeXML *xml)
page_num = atol(page); page_num = atol(page);
gmdb_debug_display(xml, page_num); gmdb_debug_display(xml, page_num);
} }
void static void
gmdb_debug_back_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_back_cb(GtkWidget *w, GladeXML *xml)
{ {
guint *nav_elem; guint *nav_elem;
@ -183,7 +184,7 @@ gmdb_debug_back_cb(GtkWidget *w, GladeXML *xml)
page_num = atol(page); page_num = atol(page);
gmdb_debug_display(xml, page_num); gmdb_debug_display(xml, page_num);
} }
void static void
gmdb_nav_add_page(GladeXML *xml, guint32 page_num) gmdb_nav_add_page(GladeXML *xml, guint32 page_num)
{ {
GList *nav_list = NULL; GList *nav_list = NULL;
@ -227,7 +228,7 @@ gmdb_nav_add_page(GladeXML *xml, guint32 page_num)
g_object_set_data(G_OBJECT(win), "nav_list", nav_list); g_object_set_data(G_OBJECT(win), "nav_list", nav_list);
g_object_set_data(G_OBJECT(win), "nav_elem", nav_elem); g_object_set_data(G_OBJECT(win), "nav_elem", nav_elem);
} }
void static void
gmdb_debug_jump_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_jump_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkTextView *textview; GtkTextView *textview;
@ -266,7 +267,7 @@ gmdb_debug_jump_cb(GtkWidget *w, GladeXML *xml)
gtk_entry_set_text(GTK_ENTRY(entry),page); gtk_entry_set_text(GTK_ENTRY(entry),page);
gmdb_debug_display_cb(w, xml); gmdb_debug_display_cb(w, xml);
} }
void static void
gmdb_debug_jump_msb_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_jump_msb_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkTextView *textview; GtkTextView *textview;
@ -306,7 +307,7 @@ gmdb_debug_jump_msb_cb(GtkWidget *w, GladeXML *xml)
gtk_entry_set_text(GTK_ENTRY(entry),page); gtk_entry_set_text(GTK_ENTRY(entry),page);
gmdb_debug_display_cb(w, xml); gmdb_debug_display_cb(w, xml);
} }
void static void
gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml)
{ {
int page; int page;
@ -333,8 +334,10 @@ gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml)
page = atol(gtk_entry_get_text(GTK_ENTRY(entry))); page = atol(gtk_entry_get_text(GTK_ENTRY(entry)));
} }
if (page>gmdb_get_max_page(mdb) || page<0) { if (page>gmdb_get_max_page(mdb) || page<0) {
GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w), GtkWidget* dlg = gtk_message_dialog_new (
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, GTK_WINDOW(gtk_widget_get_toplevel(w)),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING,
GTK_BUTTONS_CLOSE,
_("Page entered is outside valid page range.")); _("Page entered is outside valid page range."));
gtk_dialog_run (GTK_DIALOG (dlg)); gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg); gtk_widget_destroy (dlg);
@ -345,7 +348,7 @@ gmdb_debug_display_cb(GtkWidget *w, GladeXML *xml)
/* gmdb_debug_display handles the mechanics of getting the page up */ /* gmdb_debug_display handles the mechanics of getting the page up */
gmdb_debug_display(xml, page); gmdb_debug_display(xml, page);
} }
void static void
gmdb_debug_display(GladeXML *xml, guint32 page) gmdb_debug_display(GladeXML *xml, guint32 page)
{ {
unsigned char *fbuf; unsigned char *fbuf;
@ -421,7 +424,7 @@ struct stat st;
assert( fstat(mdb->f->fd, &st)!=-1 ); assert( fstat(mdb->f->fd, &st)!=-1 );
return st.st_size/mdb->fmt->pg_size; return st.st_size/mdb->fmt->pg_size;
} }
gchar * static gchar *
gmdb_val_to_str(GMdbValStr *valstr, gint val) gmdb_val_to_str(GMdbValStr *valstr, gint val)
{ {
gchar *strptr; gchar *strptr;
@ -469,7 +472,7 @@ l+=c[0];
return l; return l;
} }
void static void
gmdb_debug_dissect_column(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset) gmdb_debug_dissect_column(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset)
{ {
gchar str[100]; gchar str[100];
@ -493,7 +496,7 @@ gmdb_debug_dissect_column(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf,
snprintf(str, 100, "Column Length: %d", get_uint16(&fbuf[offset+16])); snprintf(str, 100, "Column Length: %d", get_uint16(&fbuf[offset+16]));
gmdb_debug_add_item(store, parent, str, offset+16, offset+17); gmdb_debug_add_item(store, parent, str, offset+16, offset+17);
} }
void static void
gmdb_debug_dissect_index1(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset) gmdb_debug_dissect_index1(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset)
{ {
gchar str[100]; gchar str[100];
@ -503,7 +506,7 @@ gmdb_debug_dissect_index1(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf,
snprintf(str, 100, "Rows in Index: %lu", (unsigned long)get_uint32(&fbuf[offset+4])); snprintf(str, 100, "Rows in Index: %lu", (unsigned long)get_uint32(&fbuf[offset+4]));
gmdb_debug_add_item(store, parent, str, offset+4, offset+7); gmdb_debug_add_item(store, parent, str, offset+4, offset+7);
} }
void static void
gmdb_debug_dissect_index2(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset) gmdb_debug_dissect_index2(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset)
{ {
gchar str[100]; gchar str[100];
@ -534,7 +537,7 @@ gmdb_debug_dissect_index2(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf,
snprintf(str, 100, "Index Flags (%s)", flagstr); snprintf(str, 100, "Index Flags (%s)", flagstr);
gmdb_debug_add_item(store, parent, str, offset+38, offset+38); gmdb_debug_add_item(store, parent, str, offset+38, offset+38);
} }
void static void
gmdb_debug_add_page_ptr(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, const char *label, int offset) gmdb_debug_add_page_ptr(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, const char *label, int offset)
{ {
gchar str[100]; gchar str[100];
@ -548,7 +551,7 @@ GtkTreeIter *node;
snprintf(str, 100, "Page Number: %lu", (unsigned long)get_uint24(&fbuf[offset+1])); snprintf(str, 100, "Page Number: %lu", (unsigned long)get_uint24(&fbuf[offset+1]));
gmdb_debug_add_item(store, node, str, offset+1, offset+3); gmdb_debug_add_item(store, node, str, offset+1, offset+3);
} }
void static void
gmdb_debug_dissect_row(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset, int end) gmdb_debug_dissect_row(GtkTreeStore *store, GtkTreeIter *parent, char *fbuf, int offset, int end)
{ {
gchar str[100]; gchar str[100];
@ -584,7 +587,7 @@ int i;
snprintf(str, 100, "Null mask"); snprintf(str, 100, "Null mask");
gmdb_debug_add_item(store, parent, str, var_cols_loc + 1, end); gmdb_debug_add_item(store, parent, str, var_cols_loc + 1, end);
} }
void static void
gmdb_debug_dissect_index_pg(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_index_pg(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -598,7 +601,7 @@ guint32 tdef;
gmdb_debug_add_item(store, NULL, str, offset+4, offset+7); gmdb_debug_add_item(store, NULL, str, offset+4, offset+7);
} }
void static void
gmdb_debug_dissect_leaf_pg(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_leaf_pg(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -612,7 +615,7 @@ guint32 tdef;
snprintf(str, 100, "Next leaf page: 0x%06x (%lu)", get_uint32(&fbuf[offset+12]),(unsigned long)get_uint32(&fbuf[offset+12])); snprintf(str, 100, "Next leaf page: 0x%06x (%lu)", get_uint32(&fbuf[offset+12]),(unsigned long)get_uint32(&fbuf[offset+12]));
gmdb_debug_add_item(store, NULL, str, offset+12, offset+15); gmdb_debug_add_item(store, NULL, str, offset+12, offset+15);
} }
void static void
gmdb_debug_dissect_data_pg4(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_data_pg4(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -653,7 +656,7 @@ gmdb_debug_dissect_data_pg4(GtkTreeStore *store, char *fbuf, int offset, int len
*/ */
} }
} }
void static void
gmdb_debug_dissect_data_pg3(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_data_pg3(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -693,7 +696,7 @@ gmdb_debug_dissect_data_pg3(GtkTreeStore *store, char *fbuf, int offset, int len
gmdb_debug_dissect_row(store, container, fbuf, row_start, row_end); gmdb_debug_dissect_row(store, container, fbuf, row_start, row_end);
} }
} }
void static void
gmdb_debug_dissect_data_pg(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_data_pg(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
if (IS_JET3(mdb)) if (IS_JET3(mdb))
@ -701,7 +704,7 @@ gmdb_debug_dissect_data_pg(GtkTreeStore *store, char *fbuf, int offset, int len)
else else
gmdb_debug_dissect_data_pg4(store, fbuf, offset, len); gmdb_debug_dissect_data_pg4(store, fbuf, offset, len);
} }
void static void
gmdb_debug_dissect_tabledef_pg4(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_tabledef_pg4(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -757,7 +760,7 @@ GtkTreeIter *node, *container;
} }
newbase += 25*num_cols; newbase += 25*num_cols;
} }
void static void
gmdb_debug_dissect_tabledef_pg3(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_tabledef_pg3(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -856,7 +859,7 @@ GtkTreeIter *node, *container;
newbase += namelen + 1; newbase += namelen + 1;
} }
} }
void static void
gmdb_debug_dissect_tabledef_pg(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect_tabledef_pg(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
if (IS_JET3(mdb)) if (IS_JET3(mdb))
@ -864,7 +867,7 @@ gmdb_debug_dissect_tabledef_pg(GtkTreeStore *store, char *fbuf, int offset, int
else else
gmdb_debug_dissect_tabledef_pg4(store, fbuf, offset, len); gmdb_debug_dissect_tabledef_pg4(store, fbuf, offset, len);
} }
void static void
gmdb_debug_dissect(GtkTreeStore *store, char *fbuf, int offset, int len) gmdb_debug_dissect(GtkTreeStore *store, char *fbuf, int offset, int len)
{ {
gchar str[100]; gchar str[100];
@ -910,7 +913,7 @@ GtkWidget *treeview, *textview, *store;
} }
GtkTreeIter * static GtkTreeIter *
gmdb_debug_add_item(GtkTreeStore *store, GtkTreeIter *iter1, gchar *text, int start, int end) gmdb_debug_add_item(GtkTreeStore *store, GtkTreeIter *iter1, gchar *text, int start, int end)
{ {
GtkTreeIter *iter2; GtkTreeIter *iter2;
@ -966,12 +969,12 @@ GtkTextIter start, end;
gtk_text_buffer_apply_tag (buffer, tag, &start, &end); gtk_text_buffer_apply_tag (buffer, tag, &start, &end);
} }
gint static gint
gmdb_debug_delete_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_delete_cb(GtkWidget *w, GladeXML *xml)
{ {
return FALSE; return FALSE;
} }
void static void
gmdb_debug_close_cb(GtkWidget *w, GladeXML *xml) gmdb_debug_close_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWidget *win; GtkWidget *win;

11
src/gmdb2/file.c
View File

@ -27,11 +27,7 @@ MdbHandle *mdb;
extern int main_show_debug; extern int main_show_debug;
extern GladeXML *mainwin_xml; extern GladeXML *mainwin_xml;
void gmdb_file_open_recent_1() { gmdb_file_open_recent("menu_recent1"); } static void gmdb_file_open_recent(gchar *menuname)
void gmdb_file_open_recent_2() { gmdb_file_open_recent("menu_recent2"); }
void gmdb_file_open_recent_3() { gmdb_file_open_recent("menu_recent3"); }
void gmdb_file_open_recent_4() { gmdb_file_open_recent("menu_recent4"); }
void gmdb_file_open_recent(gchar *menuname)
{ {
gchar *text, cfgname[100]; gchar *text, cfgname[100];
@ -41,6 +37,11 @@ gchar *text, cfgname[100];
g_free(text); g_free(text);
gmdb_load_recent_files(); gmdb_load_recent_files();
} }
void gmdb_file_open_recent_1() { gmdb_file_open_recent("menu_recent1"); }
void gmdb_file_open_recent_2() { gmdb_file_open_recent("menu_recent2"); }
void gmdb_file_open_recent_3() { gmdb_file_open_recent("menu_recent3"); }
void gmdb_file_open_recent_4() { gmdb_file_open_recent("menu_recent4"); }
static void static void
gmdb_file_shuffle_recent(gchar *file_path) gmdb_file_shuffle_recent(gchar *file_path)
{ {

2
src/gmdb2/form.c
View File

@ -21,7 +21,7 @@
extern GladeXML* mainwin_xml; extern GladeXML* mainwin_xml;
extern GtkWidget *app; extern GtkWidget *app;
void static void
gmdb_form_add_icon(gchar *text) gmdb_form_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;

53
src/gmdb2/gmdb.h
View File

@ -16,8 +16,15 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
void gmdb_info_msg(gchar *message); void gmdb_info_msg(gchar *message);
GtkWidget *gmdb_info_new(void);
GtkWidget *gmdb_info_new(); /* main2.c */
void gmdb_info_cb(GtkWidget *w, gpointer data);
void gmdb_prefs_cb(GtkWidget *w, gpointer data);
void gmdb_help_cb(GtkWidget *w, gpointer data);
void gmdb_about_cb(GtkWidget *w, gpointer data);
void gmdb_load_recent_files(void);
void gmdb_reset_widgets(void);
void gmdb_set_sensitive(gboolean b); void gmdb_set_sensitive(gboolean b);
GtkWidget *gmdb_table_data_new(MdbCatalogEntry *entry); GtkWidget *gmdb_table_data_new(MdbCatalogEntry *entry);
@ -27,11 +34,15 @@ void gmdb_table_export(MdbCatalogEntry *entry) ;
void gmdb_table_export_populate_dialog(GladeXML *xml); void gmdb_table_export_populate_dialog(GladeXML *xml);
/* file.c */
void gmdb_file_select_cb(GtkWidget *w, gpointer data); void gmdb_file_select_cb(GtkWidget *w, gpointer data);
void gmdb_file_open_cb(GtkWidget *w, gpointer data); void gmdb_file_open_cb(GtkWidget *w, gpointer data);
void gmdb_file_close_cb(GtkWidget *w, gpointer data); void gmdb_file_close_cb(GtkWidget *w, gpointer data);
void gmdb_file_open_recent_1(void);
void gmdb_file_open_recent_2(void);
void gmdb_file_open_recent_3(void);
void gmdb_file_open_recent_4(void);
void gmdb_file_open(gchar *file_path); void gmdb_file_open(gchar *file_path);
void gmdb_file_open_recent(gchar *menuname);
void gmdb_sql_new_window_cb(GtkWidget *w, gpointer data); void gmdb_sql_new_window_cb(GtkWidget *w, gpointer data);
@ -44,15 +55,47 @@ void gmdb_module_populate(MdbHandle *mdb);
void gmdb_table_add_tab(GtkWidget *notebook); void gmdb_table_add_tab(GtkWidget *notebook);
void gmdb_debug_tab_new(GtkWidget *notebook); void gmdb_debug_tab_new(GtkWidget *notebook);
/* debug.c */
void gmdb_debug_new_cb(GtkWidget *w, gpointer *data); void gmdb_debug_new_cb(GtkWidget *w, gpointer *data);
void gmdb_debug_set_dissect_cb(GtkWidget *w, GladeXML *xml); void gmdb_debug_set_dissect_cb(GtkWidget *w, GladeXML *xml);
void gmdb_debug_close_all(void);
void gmdb_sql_save_query(GladeXML *xml, gchar *file_path); /* sql.c */
void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml); void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
void gmdb_sql_new_cb(GtkWidget *w, gpointer data);
void gmdb_sql_close_all(void);
void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
unsigned long gmdb_prefs_get_maxrows(); unsigned long gmdb_prefs_get_maxrows(void);
extern GtkWidget *gmdb_prefs_new(); extern GtkWidget *gmdb_prefs_new(void);
/* schema.c */
void gmdb_schema_new_cb(GtkWidget *w, gpointer data);
void gmdb_schema_export_cb(GtkWidget *w, gpointer data);
void gmdb_schema_help_cb(GtkWidget *w, gpointer data);
/* table.c */
void gmdb_table_debug_cb(GtkList *list, GtkWidget *w, gpointer data);
void gmdb_table_export_cb(GtkList *list, GtkWidget *w, gpointer data);
void gmdb_table_unselect_cb(GnomeIconList *gil, int num, GdkEvent *ev, gpointer data);
void gmdb_table_select_cb(GnomeIconList *gil, int num, GdkEvent *ev, gpointer data);
void gmdb_table_def_cb(GtkList *list, GtkWidget *w, gpointer data);
void gmdb_table_data_cb(GtkList *list, GtkWidget *w, gpointer data);
void gmdb_table_init_popup(void);
void gmdb_table_set_sensitive(gboolean b);
/* table_export.c */
void gmdb_export_help_cb(GtkWidget *w, gpointer data);
void gmdb_table_export_button_cb(GtkWidget *w, gpointer data);
void gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str);
void gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf);
void gmdb_export_get_lineterm(GladeXML *xml, gchar *lineterm, int max_buf);
int gmdb_export_get_quote(GladeXML *xml);
char gmdb_export_get_quotechar(GladeXML *xml);
int gmdb_export_get_headers(GladeXML *xml);
gchar *gmdb_export_get_filepath(GladeXML *xml);
extern GtkWidget *table_list; extern GtkWidget *table_list;
extern GtkWidget *form_list; extern GtkWidget *form_list;

4
src/gmdb2/macro.c
View File

@ -21,12 +21,12 @@
extern GladeXML* mainwin_xml; extern GladeXML* mainwin_xml;
extern GtkWidget *app; extern GtkWidget *app;
void static void
gmdb_macro_add_icon(gchar *text) gmdb_macro_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;
gil = glade_xml_get_widget (mainwin_xml, "macro_iconlist"); gil = (GnomeIconList *) glade_xml_get_widget (mainwin_xml, "macro_iconlist");
gnome_icon_list_append(gil, GMDB_ICONDIR "macro_big.xpm", text); gnome_icon_list_append(gil, GMDB_ICONDIR "macro_big.xpm", text);
} }

9
src/gmdb2/main2.c
View File

@ -28,7 +28,7 @@ GladeXML *mainwin_xml;
MdbSQL *sql; MdbSQL *sql;
/* called when the user closes the window */ /* called when the user closes the window */
gint static gint
delete_event(GtkWidget *widget, GdkEvent *event, gpointer data) delete_event(GtkWidget *widget, GdkEvent *event, gpointer data)
{ {
/* signal the main loop to quit */ /* signal the main loop to quit */
@ -76,7 +76,7 @@ gmdb_info_cb(GtkWidget *button, gpointer data)
/* a callback for the buttons */ /* a callback for the buttons */
void static void
a_callback(GtkWidget *button, gpointer data) a_callback(GtkWidget *button, gpointer data)
{ {
@ -176,12 +176,13 @@ gmdb_set_sensitive(gboolean b)
gtk_widget_set_sensitive(button,b); gtk_widget_set_sensitive(button,b);
} }
void gmdb_init_popups() static void
gmdb_init_popups()
{ {
gmdb_table_init_popup(); gmdb_table_init_popup();
} }
void static void
gmdb_load_icons(GladeXML *xml) gmdb_load_icons(GladeXML *xml)
{ {
GtkWidget *icon; GtkWidget *icon;

4
src/gmdb2/module.c
View File

@ -21,12 +21,12 @@
extern GladeXML* mainwin_xml; extern GladeXML* mainwin_xml;
extern GtkWidget *app; extern GtkWidget *app;
void static void
gmdb_module_add_icon(gchar *text) gmdb_module_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;
gil = glade_xml_get_widget (mainwin_xml, "module_iconlist"); gil = (GnomeIconList *) glade_xml_get_widget (mainwin_xml, "module_iconlist");
gnome_icon_list_append(gil, GMDB_ICONDIR "module_big.xpm", text); gnome_icon_list_append(gil, GMDB_ICONDIR "module_big.xpm", text);
} }

6
src/gmdb2/prefs.c
View File

@ -35,7 +35,7 @@ gmdb_prefs_get_maxrows()
} }
/* callbacks */ /* callbacks */
void static void
gmdb_prefs_help_cb(GtkWidget *w, gpointer data) gmdb_prefs_help_cb(GtkWidget *w, gpointer data)
{ {
GError *error = NULL; GError *error = NULL;
@ -47,7 +47,7 @@ gmdb_prefs_help_cb(GtkWidget *w, gpointer data)
} }
} }
void static void
gmdb_prefs_save_cb(GtkWidget *w, GladeXML *xml) gmdb_prefs_save_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWidget *entry; GtkWidget *entry;
@ -63,7 +63,7 @@ gmdb_prefs_save_cb(GtkWidget *w, GladeXML *xml)
if (win) gtk_widget_destroy(win); if (win) gtk_widget_destroy(win);
} }
void static void
gmdb_prefs_cancel_cb(GtkWidget *w, GladeXML *xml) gmdb_prefs_cancel_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWidget *win; GtkWidget *win;

4
src/gmdb2/query.c
View File

@ -22,12 +22,12 @@ extern GladeXML* mainwin_xml;
GtkWidget *query_list; GtkWidget *query_list;
extern GtkWidget *app; extern GtkWidget *app;
void static void
gmdb_query_add_icon(gchar *text) gmdb_query_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;
gil = glade_xml_get_widget (mainwin_xml, "query_iconlist"); gil = (GnomeIconList *) glade_xml_get_widget (mainwin_xml, "query_iconlist");
gnome_icon_list_append(gil, GMDB_ICONDIR "query_big.xpm", text); gnome_icon_list_append(gil, GMDB_ICONDIR "query_big.xpm", text);
} }

2
src/gmdb2/report.c
View File

@ -21,7 +21,7 @@
extern GladeXML* mainwin_xml; extern GladeXML* mainwin_xml;
extern GtkWidget *app; extern GtkWidget *app;
void static void
gmdb_report_add_icon(gchar *text) gmdb_report_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;

2
src/gmdb2/schema.c
View File

@ -33,7 +33,7 @@ static gchar drops;
#define ALL_TABLES "(All Tables)" #define ALL_TABLES "(All Tables)"
void static void
gmdb_schema_export() gmdb_schema_export()
{ {
FILE *outfile; FILE *outfile;

63
src/gmdb2/sql.c
View File

@ -39,8 +39,8 @@ extern GtkWidget *app;
extern MdbHandle *mdb; extern MdbHandle *mdb;
extern MdbSQL *sql; extern MdbSQL *sql;
void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml); static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
void gmdb_sql_load_query(GladeXML *xml, gchar *file_path); static void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
void void
gmdb_sql_close_all() gmdb_sql_close_all()
@ -56,7 +56,7 @@ gmdb_sql_close_all()
} }
/* callbacks */ /* callbacks */
void static void
gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml)
{ {
gchar *file_path; gchar *file_path;
@ -99,27 +99,32 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml)
} }
treeview = glade_xml_get_widget (sql_xml, "sql_results"); treeview = glade_xml_get_widget (sql_xml, "sql_results");
glist = gtk_tree_view_get_columns(treeview); glist = gtk_tree_view_get_columns(GTK_TREE_VIEW(treeview));
i = 0; i = 0;
if (need_headers) { if (need_headers) {
while (col = g_list_nth_data(glist, i)) { while (col = g_list_nth_data(glist, i)) {
gchar *title;
if (i>0) fprintf(outfile,delimiter); if (i>0) fprintf(outfile,delimiter);
gmdb_print_quote(outfile, need_quote, quotechar, delimiter, gtk_tree_view_column_get_title(col)); title = g_strdup(gtk_tree_view_column_get_title(col));
fprintf(outfile,"%s", gtk_tree_view_column_get_title(col)); gmdb_print_quote(outfile, need_quote, quotechar,
gmdb_print_quote(outfile, need_quote, quotechar, delimiter, gtk_tree_view_column_get_title(col)); delimiter, title);
fprintf(outfile,"%s", title);
gmdb_print_quote(outfile, need_quote, quotechar,
delimiter, title);
g_free(title);
i++; i++;
} }
fprintf(outfile,lineterm); fprintf(outfile,lineterm);
g_list_free(glist); g_list_free(glist);
} }
store = (GtkTreeStore *) gtk_tree_view_get_model(treeview); store = (GtkTreeStore *) gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter); gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter);
rows=0; rows=0;
g_value_init (&value, G_TYPE_STRING); g_value_init (&value, G_TYPE_STRING);
do { do {
rows++; rows++;
n_columns = gtk_tree_model_get_n_columns(store); n_columns = gtk_tree_model_get_n_columns(GTK_TREE_MODEL(store));
for (i=0; i < n_columns; i++) { for (i=0; i < n_columns; i++) {
if (i>0) fprintf(outfile,delimiter); if (i>0) fprintf(outfile,delimiter);
gtk_tree_model_get_value(GTK_TREE_MODEL(store), gtk_tree_model_get_value(GTK_TREE_MODEL(store),
@ -141,7 +146,7 @@ gmdb_sql_write_rslt_cb(GtkWidget *w, GladeXML *xml)
gtk_dialog_run (GTK_DIALOG (dlg)); gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg); gtk_widget_destroy (dlg);
} }
void static void
gmdb_sql_write_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_write_cb(GtkWidget *w, GladeXML *xml)
{ {
gchar *file_path; gchar *file_path;
@ -155,7 +160,7 @@ gmdb_sql_write_cb(GtkWidget *w, GladeXML *xml)
gtk_widget_destroy(filesel); gtk_widget_destroy(filesel);
} }
void static void
gmdb_sql_load_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_load_cb(GtkWidget *w, GladeXML *xml)
{ {
gchar *file_path; gchar *file_path;
@ -169,7 +174,7 @@ gmdb_sql_load_cb(GtkWidget *w, GladeXML *xml)
gtk_widget_destroy(filesel); gtk_widget_destroy(filesel);
} }
void static void
gmdb_sql_results_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_results_cb(GtkWidget *w, GladeXML *xml)
{ {
GladeXML *dialog_xml; GladeXML *dialog_xml;
@ -199,7 +204,7 @@ gmdb_sql_results_cb(GtkWidget *w, GladeXML *xml)
g_object_set_data(G_OBJECT(filesel), "sql_xml", xml); g_object_set_data(G_OBJECT(filesel), "sql_xml", xml);
} }
void static void
gmdb_sql_save_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_save_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWidget *textview; GtkWidget *textview;
@ -235,7 +240,7 @@ gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml)
g_object_set_data(G_OBJECT(filesel), "sql_xml", xml); g_object_set_data(G_OBJECT(filesel), "sql_xml", xml);
} }
void static void
gmdb_sql_open_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_open_cb(GtkWidget *w, GladeXML *xml)
{ {
GladeXML *dialog_xml; GladeXML *dialog_xml;
@ -255,7 +260,7 @@ gmdb_sql_open_cb(GtkWidget *w, GladeXML *xml)
filesel = glade_xml_get_widget (dialog_xml, "file_dialog"); filesel = glade_xml_get_widget (dialog_xml, "file_dialog");
g_object_set_data(G_OBJECT(filesel), "sql_xml", xml); g_object_set_data(G_OBJECT(filesel), "sql_xml", xml);
} }
void static void
gmdb_sql_copy_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_copy_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkTextBuffer *txtbuffer; GtkTextBuffer *txtbuffer;
@ -267,7 +272,7 @@ gmdb_sql_copy_cb(GtkWidget *w, GladeXML *xml)
txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_copy_clipboard(txtbuffer, clipboard); gtk_text_buffer_copy_clipboard(txtbuffer, clipboard);
} }
void static void
gmdb_sql_cut_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_cut_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkTextBuffer *txtbuffer; GtkTextBuffer *txtbuffer;
@ -279,7 +284,7 @@ gmdb_sql_cut_cb(GtkWidget *w, GladeXML *xml)
txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_cut_clipboard(txtbuffer, clipboard, TRUE); gtk_text_buffer_cut_clipboard(txtbuffer, clipboard, TRUE);
} }
void static void
gmdb_sql_paste_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_paste_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkTextBuffer *txtbuffer; GtkTextBuffer *txtbuffer;
@ -291,7 +296,7 @@ gmdb_sql_paste_cb(GtkWidget *w, GladeXML *xml)
txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview)); txtbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
gtk_text_buffer_paste_clipboard(txtbuffer, clipboard, NULL, TRUE); gtk_text_buffer_paste_clipboard(txtbuffer, clipboard, NULL, TRUE);
} }
void static void
gmdb_sql_close_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_close_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWidget *win; GtkWidget *win;
@ -300,7 +305,7 @@ gmdb_sql_close_cb(GtkWidget *w, GladeXML *xml)
if (win) gtk_widget_destroy(win); if (win) gtk_widget_destroy(win);
} }
void static void
gmdb_sql_dnd_dataget_cb( gmdb_sql_dnd_dataget_cb(
GtkWidget *w, GdkDragContext *dc, GtkWidget *w, GdkDragContext *dc,
GtkSelectionData *selection_data, guint info, guint t, GtkSelectionData *selection_data, guint info, guint t,
@ -329,7 +334,7 @@ GtkTreeIter iter2;
8, /* 8 bits per character. */ 8, /* 8 bits per character. */
tablename, strlen(tablename)); tablename, strlen(tablename));
} }
void gmdb_sql_dnd_datareceived_cb( static void gmdb_sql_dnd_datareceived_cb(
GtkWidget *w, GtkWidget *w,
GdkDragContext *dc, GdkDragContext *dc,
gint x, gint y, gint x, gint y,
@ -352,7 +357,7 @@ GtkWidget *textview;
gtk_widget_grab_focus(GTK_WIDGET(textview)); gtk_widget_grab_focus(GTK_WIDGET(textview));
} }
void static void
gmdb_sql_select_hist_cb(GtkList *list, GladeXML *xml) gmdb_sql_select_hist_cb(GtkList *list, GladeXML *xml)
{ {
gchar *buf; gchar *buf;
@ -368,7 +373,7 @@ gmdb_sql_select_hist_cb(GtkList *list, GladeXML *xml)
gtk_text_buffer_set_text(txtbuffer, buf, strlen(buf)); gtk_text_buffer_set_text(txtbuffer, buf, strlen(buf));
} }
void static void
gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml)
{ {
guint len; guint len;
@ -431,7 +436,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml)
for (i=0;i<sql->num_columns;i++) for (i=0;i<sql->num_columns;i++)
gtypes[i]=G_TYPE_STRING; gtypes[i]=G_TYPE_STRING;
store = (GtkTreeStore *) gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); store = (GtkWidget *) gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
if (store) { if (store) {
i=0; i=0;
while (column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), i)) { while (column = gtk_tree_view_get_column(GTK_TREE_VIEW(treeview), i)) {
@ -610,7 +615,7 @@ gmdb_sql_new_cb(GtkWidget *w, gpointer data)
} }
/* functions */ /* functions */
gchar * static gchar *
gmdb_sql_get_basename(char *file_path) gmdb_sql_get_basename(char *file_path)
{ {
int i, len; int i, len;
@ -629,7 +634,7 @@ gmdb_sql_get_basename(char *file_path)
return basename; return basename;
} }
void static void
gmdb_sql_set_file(GladeXML *xml, gchar *file_name) gmdb_sql_set_file(GladeXML *xml, gchar *file_name)
{ {
GtkWidget *window, *textview; GtkWidget *window, *textview;
@ -673,7 +678,7 @@ gmdb_sql_save_query(GladeXML *xml, gchar *file_path)
fclose(out); fclose(out);
gmdb_sql_set_file(xml, file_path); gmdb_sql_set_file(xml, file_path);
} }
void static void
gmdb_sql_load_query(GladeXML *xml, gchar *file_path) gmdb_sql_load_query(GladeXML *xml, gchar *file_path)
{ {
FILE *in; FILE *in;
@ -696,14 +701,14 @@ gmdb_sql_load_query(GladeXML *xml, gchar *file_path)
gtk_text_buffer_get_start_iter(txtbuffer, &start); gtk_text_buffer_get_start_iter(txtbuffer, &start);
gtk_text_buffer_get_end_iter(txtbuffer, &end); gtk_text_buffer_get_end_iter(txtbuffer, &end);
gtk_text_buffer_delete(txtbuffer, &start, &end); gtk_text_buffer_delete(txtbuffer, &start, &end);
while (len = fgets(buf, 255, in)) { while (fgets(buf, 255, in) && (*buf != '\0')) {
gtk_text_buffer_get_end_iter(txtbuffer, &end); gtk_text_buffer_get_end_iter(txtbuffer, &end);
gtk_text_buffer_insert(txtbuffer, &end, buf, len); gtk_text_buffer_insert(txtbuffer, &end, buf, strlen(buf));
} }
fclose(in); fclose(in);
gmdb_sql_set_file(xml, file_path); gmdb_sql_set_file(xml, file_path);
} }
void static void
gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml) gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml)
{ {
int i; int i;

6
src/gmdb2/table.c
View File

@ -27,8 +27,6 @@ extern MdbHandle *mdb;
int selected_table = -1; int selected_table = -1;
extern char *mdb_access_types[]; extern char *mdb_access_types[];
void gmdb_table_set_sensitive(gboolean b);
/* callbacks */ /* callbacks */
void void
gmdb_table_debug_cb(GtkList *list, GtkWidget *w, gpointer data) gmdb_table_debug_cb(GtkList *list, GtkWidget *w, gpointer data)
@ -116,7 +114,7 @@ gmdb_table_select_cb(GnomeIconList *gil, int num, GdkEvent *ev, gpointer data)
} }
} }
gboolean static gboolean
gmdb_table_popup_cb(GtkWidget *menu, GdkEvent *event) gmdb_table_popup_cb(GtkWidget *menu, GdkEvent *event)
{ {
GdkEventButton *event_button; GdkEventButton *event_button;
@ -198,7 +196,7 @@ GtkWidget *menu, *mi;
g_signal_connect_swapped (GTK_OBJECT (gil), "button_press_event", g_signal_connect_swapped (GTK_OBJECT (gil), "button_press_event",
G_CALLBACK (gmdb_table_popup_cb), GTK_OBJECT(menu)); G_CALLBACK (gmdb_table_popup_cb), GTK_OBJECT(menu));
} }
void static void
gmdb_table_add_icon(gchar *text) gmdb_table_add_icon(gchar *text)
{ {
GnomeIconList *gil; GnomeIconList *gil;

2
src/gmdb2/table_data.c
View File

@ -28,7 +28,7 @@ typedef struct GMdbDataWindow {
static GList *window_list; static GList *window_list;
/* callbacks */ /* callbacks */
gint static gint
gmdb_table_data_close(GtkWidget *w, GdkEvent *event, GMdbDataWindow *dataw) gmdb_table_data_close(GtkWidget *w, GdkEvent *event, GMdbDataWindow *dataw)
{ {
window_list = g_list_remove(window_list, dataw); window_list = g_list_remove(window_list, dataw);

2
src/gmdb2/table_def.c
View File

@ -29,7 +29,7 @@ typedef struct GMdbDefWindow {
static GList *window_list; static GList *window_list;
/* callbacks */ /* callbacks */
gint static gint
gmdb_table_def_close(GtkList *list, GtkWidget *w, GMdbDefWindow *defw) gmdb_table_def_close(GtkList *list, GtkWidget *w, GMdbDefWindow *defw)
{ {
window_list = g_list_remove(window_list, defw); window_list = g_list_remove(window_list, defw);

7
src/gmdb2/table_export.c
View File

@ -53,6 +53,7 @@ gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, ch
} }
} }
void
gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf) gmdb_export_get_delimiter(GladeXML *xml, gchar *delimiter, int max_buf)
{ {
GtkWidget *combo; GtkWidget *combo;
@ -102,7 +103,7 @@ gmdb_export_get_quote(GladeXML *xml)
} }
char char
gmdb_export_get_quotechar(GladeXML *xml) gmdb_export_get_quotechar(GladeXML *xml)
{ {
GtkWidget *combo; GtkWidget *combo;
gchar *str; gchar *str;
@ -115,7 +116,7 @@ gmdb_export_get_quotechar(GladeXML *xml)
return quotechar; return quotechar;
} }
int int
gmdb_export_get_headers(GladeXML *xml) gmdb_export_get_headers(GladeXML *xml)
{ {
GtkWidget *checkbox; GtkWidget *checkbox;
@ -126,7 +127,7 @@ gmdb_export_get_headers(GladeXML *xml)
return 0; return 0;
} }
gchar * gchar *
gmdb_export_get_filepath(GladeXML *xml) gmdb_export_get_filepath(GladeXML *xml)
{ {
GtkWidget *fentry; GtkWidget *fentry;