lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-07-15 17:58:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of GLib 2.4+ call

Browse Source
This commit is contained in:
whydoubt 2004-10-21 02:54:05 +00:00
parent 26cd3ee1ba
commit 062259b408
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
Wed Oct 20 21:49:04 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/sql/mdbsql.c: Get rid of GLib 2.4+ call
Sat Oct 16 09:19:16 CDT 2004 Jeff Smith <whydoubt@yahoo.com> Sat Oct 16 09:19:16 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* INSTALL: * INSTALL:
* README: * README:

38
src/sql/mdbsql.c
View File

@ -98,17 +98,27 @@ void mdb_sql_set_maxrow(MdbSQL *sql, int maxrow)
sql->max_rows = maxrow; sql->max_rows = maxrow;
} }
static void mdb_sql_free_column(gpointer d, gpointer u) static void mdb_sql_free_columns(GPtrArray *columns)
{ {
MdbSQLColumn *c = (MdbSQLColumn *)d; unsigned int i;
g_free(c->name); if (!columns) return;
g_free(c); for (i=0; i<columns->len; i++) {
MdbSQLColumn *c = (MdbSQLColumn *)g_ptr_array_index(columns, i);
g_free(c->name);
g_free(c);
}
g_ptr_array_free(columns, TRUE);
} }
static void mdb_sql_free_table(gpointer d, gpointer u) static void mdb_sql_free_tables(GPtrArray *tables)
{ {
MdbSQLTable *t = (MdbSQLTable *)d; unsigned int i;
g_free(t->name); if (!tables) return;
g_free(t); for (i=0; i<tables->len; i++) {
MdbSQLTable *t = (MdbSQLTable *)g_ptr_array_index(tables, i);
g_free(t->name);
g_free(t);
}
g_ptr_array_free(tables, TRUE);
} }
void void
@ -412,10 +422,8 @@ void mdb_sql_dump(MdbSQL *sql)
} }
void mdb_sql_exit(MdbSQL *sql) void mdb_sql_exit(MdbSQL *sql)
{ {
g_ptr_array_foreach(sql->columns, mdb_sql_free_column, NULL); mdb_sql_free_columns(sql->columns);
g_ptr_array_free(sql->columns, TRUE); mdb_sql_free_tables(sql->tables);
g_ptr_array_foreach(sql->tables, mdb_sql_free_table, NULL);
g_ptr_array_free(sql->tables, TRUE);
if (sql->sarg_tree) { if (sql->sarg_tree) {
mdb_sql_free_tree(sql->sarg_tree); mdb_sql_free_tree(sql->sarg_tree);
@ -437,14 +445,12 @@ void mdb_sql_reset(MdbSQL *sql)
} }
/* Reset columns */ /* Reset columns */
g_ptr_array_foreach(sql->columns, mdb_sql_free_column, NULL); mdb_sql_free_columns(sql->columns);
g_ptr_array_free(sql->columns, TRUE);
sql->num_columns = 0; sql->num_columns = 0;
sql->columns = g_ptr_array_new(); sql->columns = g_ptr_array_new();
/* Reset tables */ /* Reset tables */
g_ptr_array_foreach(sql->tables, mdb_sql_free_table, NULL); mdb_sql_free_tables(sql->tables);
g_ptr_array_free(sql->tables, TRUE);
sql->num_tables = 0; sql->num_tables = 0;
sql->tables = g_ptr_array_new(); sql->tables = g_ptr_array_new();