Move catalog functions to catalog.c

This commit is contained in:
whydoubt 2004-06-23 04:35:47 +00:00
parent 017c35df6a
commit 8e665e09e9
4 changed files with 20 additions and 17 deletions

View File

@ -3,6 +3,9 @@ Tue Jun 22 22:02:02 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/mem.c: Fix another memory leak
* src/libmdb/catalog.c: Bind columns by name in mdb_read_catalog
* src/libmdb/worktable.c: Remove only use of mdb_append_column
* src/libmdb/catalog.c:
* src/libmdb/mem.c:
* include/mdbtools.h: Move catalog functions to catalog.c
Mon Jun 21 23:18:18 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/backend.c:

View File

@ -384,8 +384,6 @@ extern void mdb_init();
extern void mdb_exit();
extern MdbStatistics *mdb_alloc_stats(MdbHandle *mdb);
extern void mdb_free_stats(MdbHandle *mdb);
extern void mdb_alloc_catalog(MdbHandle *mdb);
extern void mdb_free_catalog(MdbHandle *mdb);
extern MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry);
extern void mdb_free_tabledef(MdbTableDef *table);
extern void mdb_append_column(GPtrArray *columns, MdbColumn *in_col);
@ -414,6 +412,8 @@ extern void mdb_swap_pgbuf(MdbHandle *mdb);
extern long _mdb_get_int32(unsigned char *buf, int offset);
/* catalog.c */
extern void mdb_alloc_catalog(MdbHandle *mdb);
extern void mdb_free_catalog(MdbHandle *mdb);
GPtrArray *mdb_read_catalog(MdbHandle *mdb, int obj_type);
extern void mdb_dump_catalog(MdbHandle *mdb, int obj_type);
extern char *mdb_get_objtype_string(int obj_type);

View File

@ -47,6 +47,21 @@ static char *type_name[] = {"Form",
}
}
void mdb_alloc_catalog(MdbHandle *mdb)
{
mdb->catalog = g_ptr_array_new();
}
void mdb_free_catalog(MdbHandle *mdb)
{
unsigned int i;
if (!mdb->catalog) return;
for (i=0; i<mdb->catalog->len; i++)
g_free (g_ptr_array_index(mdb->catalog, i));
g_ptr_array_free(mdb->catalog, TRUE);
mdb->catalog = NULL;
}
/* new method */
GPtrArray *mdb_read_catalog (MdbHandle *mdb, int objtype)
{

View File

@ -65,21 +65,6 @@ mdb_free_stats(MdbHandle *mdb)
mdb->stats = NULL;
}
void mdb_alloc_catalog(MdbHandle *mdb)
{
mdb->catalog = g_ptr_array_new();
}
void mdb_free_catalog(MdbHandle *mdb)
{
unsigned int i;
if (!mdb->catalog) return;
for (i=0; i<mdb->catalog->len; i++)
g_free (g_ptr_array_index(mdb->catalog, i));
g_ptr_array_free(mdb->catalog, TRUE);
mdb->catalog = NULL;
}
MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry)
{
MdbTableDef *table;