Reduce function scopes

This patch removes a few function declarations from the catch-all gmdb.h as
they are defined and used only in a single file, and turns them in to static
(file local) functions instead.
This commit is contained in:
Filip Van Raemdonck
2012-02-02 19:42:39 +01:00
committed by Nirgal Vourgère
parent e88c8d2043
commit 21a4229e40
2 changed files with 10 additions and 12 deletions

View File

@@ -57,10 +57,8 @@ void gmdb_debug_set_dissect_cb(GtkWidget *w, gpointer data);
void gmdb_debug_close_all(void); void gmdb_debug_close_all(void);
/* sql.c */ /* sql.c */
void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
void gmdb_sql_new_cb(GtkWidget *w, gpointer data); void gmdb_sql_new_cb(GtkWidget *w, gpointer data);
void gmdb_sql_close_all(void); void gmdb_sql_close_all(void);
void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
unsigned long gmdb_prefs_get_maxrows(void); unsigned long gmdb_prefs_get_maxrows(void);

View File

@@ -39,8 +39,10 @@ extern GtkWidget *app;
extern MdbHandle *mdb; extern MdbHandle *mdb;
extern MdbSQL *sql; extern MdbSQL *sql;
static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml); static void gmdb_sql_tree_populate (MdbHandle*, GladeXML*);
static void gmdb_sql_load_query(GladeXML *xml, gchar *file_path); static void gmdb_sql_load_query (GladeXML*, gchar*);
static void gmdb_sql_save_query (GladeXML*, gchar*);
static void gmdb_sql_save_as_cb (GtkWidget*, GladeXML*);
void void
gmdb_sql_close_all() gmdb_sql_close_all()
@@ -190,7 +192,7 @@ gmdb_sql_save_cb(GtkWidget *w, GladeXML *xml)
} }
gmdb_sql_save_query(xml, str); gmdb_sql_save_query(xml, str);
} }
void static void
gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml) gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml)
{ {
GtkWindow *parent_window = (GtkWindow *) glade_xml_get_widget (xml, "gmdb"); GtkWindow *parent_window = (GtkWindow *) glade_xml_get_widget (xml, "gmdb");
@@ -458,8 +460,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml)
} }
void void
gmdb_sql_new_cb(GtkWidget *w, gpointer data) gmdb_sql_new_cb (GtkWidget *w, gpointer data) {
{
GtkTargetEntry src; GtkTargetEntry src;
GtkWidget *mi, *but, *combo; GtkWidget *mi, *but, *combo;
GladeXML *sqlwin_xml; GladeXML *sqlwin_xml;
@@ -619,9 +620,9 @@ gmdb_sql_set_file(GladeXML *xml, gchar *file_name)
textview = glade_xml_get_widget(xml, "sql_textview"); textview = glade_xml_get_widget(xml, "sql_textview");
g_object_set_data(G_OBJECT(textview), "file_name", file_name); g_object_set_data(G_OBJECT(textview), "file_name", file_name);
} }
void
gmdb_sql_save_query(GladeXML *xml, gchar *file_path) static void
{ gmdb_sql_save_query (GladeXML *xml, gchar *file_path) {
FILE *out; FILE *out;
GtkWidget *textview; GtkWidget *textview;
GtkTextBuffer *txtbuffer; GtkTextBuffer *txtbuffer;
@@ -697,8 +698,7 @@ GtkTreeIter *iter2;
#else #else
void void
gmdb_sql_new_cb(GtkWidget *w, gpointer data) gmdb_sql_new_cb (GtkWidget *w, gpointer data) {
{
GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w), GtkWidget* dlg = gtk_message_dialog_new (gtk_widget_get_toplevel (w),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE,
_("SQL support was not built.\nRun configure with the --enable-sql option.")); _("SQL support was not built.\nRun configure with the --enable-sql option."));