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

malloc to g_malloc

Browse Source
This commit is contained in:
whydoubt 2004-05-30 05:06:26 +00:00
parent b14de7135e
commit fc59a5eca8
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun May 30 00:04:55 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/data.c:
* src/libmdb/file.c:
* src/libmdb/mem.c:
* src/libmdb/table.c: malloc to g_malloc
Sat May 29 14:14:21 CDT 2004 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/backend.c:
* src/libmdb/file.c: malloc to g_malloc for backend functions

12
src/libmdb/data.c
View File

@ -607,21 +607,21 @@ mdb_fetch_row(MdbTableDef *table)
}
void mdb_data_dump(MdbTableDef *table)
{
int i, j;
char *bound_values[MDB_MAX_COLS];
unsigned int i;
char *bound_values[MDB_MAX_COLS];
for (i=0;i<table->num_cols;i++) {
bound_values[i] = (char *) malloc(256);
bound_values[i] = (char *) g_malloc(256);
mdb_bind_column(table, i+1, bound_values[i]);
}
mdb_rewind_table(table);
while (mdb_fetch_row(table)) {
for (j=0;j<table->num_cols;j++) {
fprintf(stdout, "column %d is %s\n", j+1, bound_values[j]);
for (i=0;i<table->num_cols;i++) {
fprintf(stdout, "column %d is %s\n", i+1, bound_values[i]);
}
}
for (i=0;i<table->num_cols;i++) {
free(bound_values[i]);
g_free(bound_values[i]);
}
}

25
src/libmdb/file.c
View File

@ -110,25 +110,23 @@ MdbHandle *mdb;
int bufsize;
MdbFile *f;
mdb = (MdbHandle *) malloc(sizeof(MdbHandle));
memset(mdb, '\0', sizeof(MdbHandle));
mdb = (MdbHandle *) g_malloc0(sizeof(MdbHandle));
mdb_set_default_backend(mdb, "access");
/* need something to bootstrap with, reassign after page 0 is read */
mdb->fmt = &MdbJet3Constants;
mdb->f = f = (MdbFile *) malloc(sizeof(MdbFile));
memset(f, '\0', sizeof(MdbFile));
f->filename = (char *) malloc(strlen(filename)+1);
mdb->f = f = (MdbFile *) g_malloc0(sizeof(MdbFile));
f->filename = (char *) g_malloc(strlen(filename)+1);
bufsize = strlen(filename)+1;
bufsize = mdb_find_file(filename, f->filename, bufsize);
if (bufsize) {
f->filename = (char *) realloc(f->filename, bufsize+1);
f->filename = (char *) g_realloc(f->filename, bufsize+1);
bufsize = mdb_find_file(filename, f->filename, bufsize);
if (bufsize) {
fprintf(stderr, "Can't alloc filename\n");
free(f->filename);
free(f);
g_free(f->filename);
g_free(f);
g_free(mdb->backend_name);
free(mdb);
g_free(mdb);
return NULL;
}
}
@ -186,12 +184,12 @@ mdb_close(MdbHandle *mdb)
mdb->f->refs--;
} else {
if (mdb->f->fd) close(mdb->f->fd);
if (mdb->f->filename) free(mdb->f->filename);
free(mdb->f);
g_free(mdb->f->filename);
g_free(mdb->f);
}
}
free(mdb);
g_free(mdb);
}
/**
* mdb_clone_handle:
@ -208,8 +206,7 @@ MdbHandle *mdb_clone_handle(MdbHandle *mdb)
MdbCatalogEntry *entry, *data;
int i;
newmdb = (MdbHandle *) malloc(sizeof(MdbHandle));
memcpy(newmdb, mdb, sizeof(MdbHandle));
newmdb = (MdbHandle *) g_memdup(mdb, sizeof(MdbHandle));
newmdb->stats = NULL;
newmdb->catalog = g_ptr_array_new();
for (i=0;i<mdb->num_catalog;i++) {

9
src/libmdb/mem.c
View File

@ -84,8 +84,7 @@ MdbTableDef *mdb_alloc_tabledef(MdbCatalogEntry *entry)
{
MdbTableDef *table;
table = (MdbTableDef *) malloc(sizeof(MdbTableDef));
memset(table, '\0', sizeof(MdbTableDef));
table = (MdbTableDef *) g_malloc0(sizeof(MdbTableDef));
table->entry=entry;
strcpy(table->name, entry->object_name);
@ -95,9 +94,9 @@ void
mdb_free_tabledef(MdbTableDef *table)
{
if (!table) return;
if (table->usage_map) free(table->usage_map);
if (table->free_usage_map) free(table->free_usage_map);
free(table);
g_free(table->usage_map);
g_free(table->free_usage_map);
g_free(table);
}
void

6
src/libmdb/table.c
View File

@ -73,8 +73,7 @@ mdb_read_table(MdbCatalogEntry *entry)
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (rownum*2));
row_end = mdb_find_end_of_row(mdb, rownum);
table->map_sz = row_end - row_start + 1;
table->usage_map = malloc(table->map_sz);
memcpy(table->usage_map, &mdb->pg_buf[row_start], table->map_sz);
table->usage_map = g_memdup(&mdb->pg_buf[row_start], table->map_sz);
if (mdb_get_option(MDB_DEBUG_USAGE))
buffer_dump(mdb->pg_buf, row_start, row_end);
/* swap back */
@ -91,8 +90,7 @@ mdb_read_table(MdbCatalogEntry *entry)
row_start = mdb_pg_get_int16(mdb, (fmt->row_count_offset + 2) + (rownum*2));
row_end = mdb_find_end_of_row(mdb, rownum);
table->freemap_sz = row_end - row_start + 1;
table->free_usage_map = malloc(table->freemap_sz);
memcpy(table->free_usage_map, &mdb->pg_buf[row_start], table->freemap_sz);
table->free_usage_map = g_memdup(&mdb->pg_buf[row_start], table->freemap_sz);
mdb_swap_pgbuf(mdb);
#endif
mdb_debug(MDB_DEBUG_USAGE,"free map found on page %ld rownum %d start %d end %d\n", mdb_pg_get_int24(mdb, fmt->tab_free_map_offset + 1), rownum, row_start, row_end);