Remove only use of mdb_append_column

This commit is contained in:
whydoubt 2004-06-23 04:22:45 +00:00
parent e323873a62
commit 017c35df6a
2 changed files with 9 additions and 8 deletions

View File

@ -2,6 +2,7 @@ Tue Jun 22 22:02:02 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/util/mdb-schema.c: Fix a memory leak * src/util/mdb-schema.c: Fix a memory leak
* src/libmdb/mem.c: Fix another memory leak * src/libmdb/mem.c: Fix another memory leak
* src/libmdb/catalog.c: Bind columns by name in mdb_read_catalog * src/libmdb/catalog.c: Bind columns by name in mdb_read_catalog
* src/libmdb/worktable.c: Remove only use of mdb_append_column
Mon Jun 21 23:18:18 CDT 2004 Jeff Smith <whydoubt@yahoo.com> Mon Jun 21 23:18:18 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/backend.c: * src/libmdb/backend.c:

View File

@ -50,17 +50,17 @@ mdb_fill_temp_field(MdbField *field, void *value, int siz, int is_fixed, int is_
MdbTableDef * MdbTableDef *
mdb_create_temp_table(MdbHandle *mdb, char *name) mdb_create_temp_table(MdbHandle *mdb, char *name)
{ {
MdbCatalogEntry entry; MdbCatalogEntry *entry;
MdbTableDef *table; MdbTableDef *table;
/* dummy up a catalog entry */ /* dummy up a catalog entry */
memset(&entry, 0, sizeof(MdbCatalogEntry)); entry = (MdbCatalogEntry *) g_malloc0(sizeof(MdbCatalogEntry));
entry.mdb = mdb; entry->mdb = mdb;
entry.object_type = MDB_TABLE; entry->object_type = MDB_TABLE;
entry.table_pg = 0; entry->table_pg = 0;
strcpy(entry.object_name, name); strcpy(entry->object_name, name);
table = mdb_alloc_tabledef(g_memdup(&entry, sizeof(MdbCatalogEntry))); table = mdb_alloc_tabledef(entry);
table->columns = g_ptr_array_new(); table->columns = g_ptr_array_new();
return table; return table;
@ -69,6 +69,6 @@ void
mdb_temp_table_add_col(MdbTableDef *table, MdbColumn *col) mdb_temp_table_add_col(MdbTableDef *table, MdbColumn *col)
{ {
col->col_num = table->num_cols; col->col_num = table->num_cols;
mdb_append_column(table->columns, col); g_ptr_array_add(table->columns, g_memdup(col, sizeof(MdbColumn)));
table->num_cols++; table->num_cols++;
} }