mirror of
https://github.com/mdbtools/mdbtools.git
synced 2025-07-16 00:36:43 +08:00
Back out some ineffective NULL setting
This commit is contained in:
parent
4ef8af1826
commit
1a1127e930
@ -1,6 +1,9 @@
|
||||
Sat Apr 24 21:39:10 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
|
||||
* src/libmdb/file.c:
|
||||
* src/libmdb/mem.c: Moving some NULL pointer tests
|
||||
* src/libmdb/mem.c
|
||||
* src/libmdb/props.c:
|
||||
* src/sql/mdbsql.c: Back out some ineffective NULL setting
|
||||
|
||||
Sat Apr 24 15:27:51 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
|
||||
* src/libmdb/file.c:
|
||||
|
@ -84,7 +84,6 @@ mdb_free_file(MdbFile *f)
|
||||
if (f->fd) close(f->fd);
|
||||
if (f->filename) free(f->filename);
|
||||
free(f);
|
||||
f = NULL;
|
||||
}
|
||||
|
||||
MdbHandle *mdb_alloc_handle()
|
||||
@ -106,7 +105,6 @@ void mdb_free_handle(MdbHandle *mdb)
|
||||
mdb_free_file(mdb->f);
|
||||
if (mdb->backend_name) free(mdb->backend_name);
|
||||
free(mdb);
|
||||
mdb = NULL;
|
||||
}
|
||||
|
||||
void mdb_alloc_catalog(MdbHandle *mdb)
|
||||
@ -146,7 +144,6 @@ mdb_free_tabledef(MdbTableDef *table)
|
||||
if (table->usage_map) free(table->usage_map);
|
||||
if (table->free_usage_map) free(table->free_usage_map);
|
||||
free(table);
|
||||
table = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
@ -161,7 +158,6 @@ void
|
||||
mdb_free_columns(GPtrArray *columns)
|
||||
{
|
||||
g_ptr_array_free(columns, TRUE);
|
||||
columns = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
@ -176,5 +172,4 @@ void
|
||||
mdb_free_indices(GPtrArray *indices)
|
||||
{
|
||||
g_ptr_array_free(indices, TRUE);
|
||||
indices = NULL;
|
||||
}
|
||||
|
@ -59,7 +59,6 @@ mdb_free_props(MdbProperties *props)
|
||||
|
||||
if (props->name) g_free(props->name);
|
||||
g_free(props);
|
||||
props = NULL;
|
||||
}
|
||||
MdbProperties *
|
||||
mdb_alloc_props()
|
||||
|
@ -68,7 +68,6 @@ MdbSQL *sql;
|
||||
sql->sarg_stack = NULL;
|
||||
sql->max_rows = -1;
|
||||
|
||||
|
||||
return sql;
|
||||
}
|
||||
|
||||
@ -102,7 +101,6 @@ void mdb_sql_free_column(MdbSQLColumn *c)
|
||||
{
|
||||
if (c->name) g_free(c->name);
|
||||
g_free(c);
|
||||
c = NULL;
|
||||
}
|
||||
MdbSQLColumn *mdb_sql_alloc_column()
|
||||
{
|
||||
@ -116,7 +114,6 @@ void mdb_sql_free_table(MdbSQLTable *t)
|
||||
{
|
||||
if (t->name) g_free(t->name);
|
||||
g_free(t);
|
||||
t = NULL;
|
||||
}
|
||||
MdbSQLTable *mdb_sql_alloc_table()
|
||||
{
|
||||
@ -192,7 +189,6 @@ mdb_sql_free_tree(MdbSargNode *tree)
|
||||
if (tree->left) mdb_sql_free_tree(tree->left);
|
||||
if (tree->right) mdb_sql_free_tree(tree->right);
|
||||
g_free(tree);
|
||||
tree = NULL;
|
||||
}
|
||||
void
|
||||
mdb_sql_push_node(MdbSQL *sql, MdbSargNode *node)
|
||||
@ -454,6 +450,7 @@ MdbSQLTable *t;
|
||||
}
|
||||
if (sql->sarg_tree) {
|
||||
mdb_sql_free_tree(sql->sarg_tree);
|
||||
sql->sarg_tree = NULL;
|
||||
}
|
||||
g_list_free(sql->sarg_stack);
|
||||
sql->sarg_stack = NULL;
|
||||
@ -472,6 +469,7 @@ MdbSQLTable *t;
|
||||
if (sql->cur_table) {
|
||||
mdb_index_scan_free(sql->cur_table);
|
||||
mdb_free_tabledef(sql->cur_table);
|
||||
sql->cur_table = NULL;
|
||||
}
|
||||
if (sql->kludge_ttable_pg) {
|
||||
g_free(sql->kludge_ttable_pg);
|
||||
@ -487,6 +485,7 @@ MdbSQLTable *t;
|
||||
}
|
||||
if (sql->sarg_tree) {
|
||||
mdb_sql_free_tree(sql->sarg_tree);
|
||||
sql->sarg_tree = NULL;
|
||||
}
|
||||
g_list_free(sql->sarg_stack);
|
||||
sql->sarg_stack = NULL;
|
||||
|
Loading…
Reference in New Issue
Block a user