lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-09-19 02:27:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop exporting internal libmdbsql symbols

Browse Source
This commit is contained in:
Nirgl Vourgère
2011-08-10 18:02:51 -04:00
committed by Brian Bruns
parent ed0a5b56a6
commit 3f26ec69cf
2 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gmdb2/sql.c
View File

@@ -386,20 +386,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml)
gtk_combo_set_popdown_strings(GTK_COMBO(combo), history); gtk_combo_set_popdown_strings(GTK_COMBO(combo), history);
/* ok now execute it */ /* ok now execute it */
g_input_ptr = buf; mdb_sql_run_query(sql, buf);
/* begin unsafe */
_mdb_sql(sql);
mdb_sql_clear_error(sql);
if (yyparse()) {
/* end unsafe */
GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
_("Couldn't parse SQL."));
gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
mdb_sql_reset(sql);
return;
}
if (mdb_sql_has_error(sql)) { if (mdb_sql_has_error(sql)) {
GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)), GtkWidget* dlg = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (w)),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE,
@@ -408,7 +395,7 @@ gmdb_sql_execute_cb(GtkWidget *w, GladeXML *xml)
gtk_widget_destroy (dlg); gtk_widget_destroy (dlg);
mdb_sql_reset(sql); mdb_sql_reset(sql);
return; return;
} }
treeview = glade_xml_get_widget(xml, "sql_results"); treeview = glade_xml_get_widget(xml, "sql_results");

19
src/util/mdb-sql.c
View File

@@ -55,7 +55,6 @@ extern void clear_history ();
void dump_results(FILE *out, MdbSQL *sql, char *delimiter); void dump_results(FILE *out, MdbSQL *sql, char *delimiter);
void dump_results_pp(FILE *out, MdbSQL *sql); void dump_results_pp(FILE *out, MdbSQL *sql);
int yyparse(void);
#if SQL #if SQL
@@ -92,21 +91,6 @@ int i = 0;
} }
#endif #endif
int parse(MdbSQL *sql, char *buf)
{
g_input_ptr = buf;
/* begin unsafe */
_mdb_sql(sql);
if (yyparse()) {
/* end unsafe */
fprintf(stderr, "Couldn't parse SQL\n");
mdb_sql_reset(sql);
return 1;
} else {
return 0;
}
}
void void
do_set_cmd(MdbSQL *sql, char *s) do_set_cmd(MdbSQL *sql, char *s)
{ {
@@ -204,7 +188,8 @@ run_query(FILE *out, MdbSQL *sql, char *mybuf, char *delimiter)
{ {
MdbTableDef *table; MdbTableDef *table;
if (!parse(sql, mybuf) && sql->cur_table) { mdb_sql_run_query(sql, mybuf);
if (!mdb_sql_has_error(sql)) {
if (showplan) { if (showplan) {
table = sql->cur_table; table = sql->cur_table;
if (table->sarg_tree) mdb_sql_dump_node(table->sarg_tree, 0); if (table->sarg_tree) mdb_sql_dump_node(table->sarg_tree, 0);