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

Back out some ineffective NULL setting

Browse Source
This commit is contained in:
whydoubt 2004-04-25 05:31:23 +00:00
parent 4ef8af1826
commit 1a1127e930
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,6 +1,9 @@
Sat Apr 24 21:39:10 CDT 2004 Jeff Smith <whydoubt@yahoo.com> Sat Apr 24 21:39:10 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/file.c: * src/libmdb/file.c:
* src/libmdb/mem.c: Moving some NULL pointer tests * 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> Sat Apr 24 15:27:51 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/file.c: * src/libmdb/file.c:

5
src/libmdb/mem.c
View File

@ -84,7 +84,6 @@ mdb_free_file(MdbFile *f)
if (f->fd) close(f->fd); if (f->fd) close(f->fd);
if (f->filename) free(f->filename); if (f->filename) free(f->filename);
free(f); free(f);
f = NULL;
} }
MdbHandle *mdb_alloc_handle() MdbHandle *mdb_alloc_handle()
@ -106,7 +105,6 @@ void mdb_free_handle(MdbHandle *mdb)
mdb_free_file(mdb->f); mdb_free_file(mdb->f);
if (mdb->backend_name) free(mdb->backend_name); if (mdb->backend_name) free(mdb->backend_name);
free(mdb); free(mdb);
mdb = NULL;
} }
void mdb_alloc_catalog(MdbHandle *mdb) 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->usage_map) free(table->usage_map);
if (table->free_usage_map) free(table->free_usage_map); if (table->free_usage_map) free(table->free_usage_map);
free(table); free(table);
table = NULL;
} }
void void
@ -161,7 +158,6 @@ void
mdb_free_columns(GPtrArray *columns) mdb_free_columns(GPtrArray *columns)
{ {
g_ptr_array_free(columns, TRUE); g_ptr_array_free(columns, TRUE);
columns = NULL;
} }
void void
@ -176,5 +172,4 @@ void
mdb_free_indices(GPtrArray *indices) mdb_free_indices(GPtrArray *indices)
{ {
g_ptr_array_free(indices, TRUE); g_ptr_array_free(indices, TRUE);
indices = NULL;
} }

1
src/libmdb/props.c
View File

@ -59,7 +59,6 @@ mdb_free_props(MdbProperties *props)
if (props->name) g_free(props->name); if (props->name) g_free(props->name);
g_free(props); g_free(props);
props = NULL;
} }
MdbProperties * MdbProperties *
mdb_alloc_props() mdb_alloc_props()

9
src/sql/mdbsql.c
View File

@ -67,7 +67,6 @@ MdbSQL *sql;
sql->sarg_tree = NULL; sql->sarg_tree = NULL;
sql->sarg_stack = NULL; sql->sarg_stack = NULL;
sql->max_rows = -1; sql->max_rows = -1;
return sql; return sql;
} }
@ -102,7 +101,6 @@ void mdb_sql_free_column(MdbSQLColumn *c)
{ {
if (c->name) g_free(c->name); if (c->name) g_free(c->name);
g_free(c); g_free(c);
c = NULL;
} }
MdbSQLColumn *mdb_sql_alloc_column() MdbSQLColumn *mdb_sql_alloc_column()
{ {
@ -116,7 +114,6 @@ void mdb_sql_free_table(MdbSQLTable *t)
{ {
if (t->name) g_free(t->name); if (t->name) g_free(t->name);
g_free(t); g_free(t);
t = NULL;
} }
MdbSQLTable *mdb_sql_alloc_table() 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->left) mdb_sql_free_tree(tree->left);
if (tree->right) mdb_sql_free_tree(tree->right); if (tree->right) mdb_sql_free_tree(tree->right);
g_free(tree); g_free(tree);
tree = NULL;
} }
void void
mdb_sql_push_node(MdbSQL *sql, MdbSargNode *node) mdb_sql_push_node(MdbSQL *sql, MdbSargNode *node)
@ -454,13 +450,14 @@ MdbSQLTable *t;
} }
if (sql->sarg_tree) { if (sql->sarg_tree) {
mdb_sql_free_tree(sql->sarg_tree); mdb_sql_free_tree(sql->sarg_tree);
sql->sarg_tree = NULL;
} }
g_list_free(sql->sarg_stack); g_list_free(sql->sarg_stack);
sql->sarg_stack = NULL; sql->sarg_stack = NULL;
g_ptr_array_free(sql->columns,TRUE); g_ptr_array_free(sql->columns,TRUE);
g_ptr_array_free(sql->tables,TRUE); g_ptr_array_free(sql->tables,TRUE);
if (sql->mdb) { if (sql->mdb) {
mdb_close(sql->mdb); mdb_close(sql->mdb);
} }
} }
void mdb_sql_reset(MdbSQL *sql) void mdb_sql_reset(MdbSQL *sql)
@ -472,6 +469,7 @@ MdbSQLTable *t;
if (sql->cur_table) { if (sql->cur_table) {
mdb_index_scan_free(sql->cur_table); mdb_index_scan_free(sql->cur_table);
mdb_free_tabledef(sql->cur_table); mdb_free_tabledef(sql->cur_table);
sql->cur_table = NULL;
} }
if (sql->kludge_ttable_pg) { if (sql->kludge_ttable_pg) {
g_free(sql->kludge_ttable_pg); g_free(sql->kludge_ttable_pg);
@ -487,6 +485,7 @@ MdbSQLTable *t;
} }
if (sql->sarg_tree) { if (sql->sarg_tree) {
mdb_sql_free_tree(sql->sarg_tree); mdb_sql_free_tree(sql->sarg_tree);
sql->sarg_tree = NULL;
} }
g_list_free(sql->sarg_stack); g_list_free(sql->sarg_stack);
sql->sarg_stack = NULL; sql->sarg_stack = NULL;