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

Replace malloc/memset with g_malloc0

Browse Source
This commit is contained in:
whydoubt 2004-12-31 05:10:18 +00:00
parent d06cb3e47d
commit 680e997365
5 changed files with 24 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -20,6 +20,10 @@ Thu Dec 30 19:26:01 CST 2004 Jeff Smith <whydoubt@yahoo.com>
* src/util/prole.c:
* src/util/sargtest.c:
* src/util/updrow.c: Combine functions that bind a column and its length
* src/gmdb/debug.c:
* src/gmdb/table_def.c:
* src/gmdb2/debug.c:
* src/gmdb2/table_def.c: Replace malloc/memset with g_malloc0
Thu Dec 30 06:36:25 CST 2004 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h: Fix MdbSargTreeFunc's typedef

9
src/gmdb/debug.c
View File

@ -194,9 +194,8 @@ char field[10];
pos = lseek(mdb->fd, 0, SEEK_CUR);
lseek(mdb->fd, page * mdb->pg_size, SEEK_SET);
fbuf = (unsigned char *) malloc(mdb->pg_size);
tbuf = (unsigned char *) malloc( (mdb->pg_size / 16) * 80);
memset(tbuf, 0, (mdb->pg_size / 16) * 80);
fbuf = (unsigned char *) g_malloc(mdb->pg_size);
tbuf = (unsigned char *) g_malloc0( (mdb->pg_size / 16) * 80);
length = read(mdb->fd, fbuf, mdb->pg_size);
if (length<mdb->pg_size) {
}
@ -225,8 +224,8 @@ char field[10];
tbuf, strlen(tbuf));
//gtk_editable_select_region(GTK_EDITABLE(dbug->textbox), 9, 15);
gmdb_debug_dissect(dbug, fbuf, 0, length);
free(fbuf);
free(tbuf);
g_free(fbuf);
g_free(tbuf);
}
/* functions */

18
src/gmdb/table_def.c
View File

@ -81,18 +81,12 @@ GMdbDefWindow *defw;
for (i=0;i<table->num_cols;i++) {
/* display column titles */
col=g_ptr_array_index(table->columns,i);
row[0] = (char *) malloc(MDB_BIND_SIZE);
memset(row[0],0,MDB_BIND_SIZE);
row[1] = (char *) malloc(MDB_BIND_SIZE);
memset(row[1],0,MDB_BIND_SIZE);
row[2] = (char *) malloc(MDB_BIND_SIZE);
memset(row[2],0,MDB_BIND_SIZE);
row[3] = (char *) malloc(MDB_BIND_SIZE);
memset(row[3],0,MDB_BIND_SIZE);
row[4] = (char *) malloc(MDB_BIND_SIZE);
memset(row[4],0,MDB_BIND_SIZE);
row[5] = (char *) malloc(MDB_BIND_SIZE);
memset(row[5],0,MDB_BIND_SIZE);
row[0] = (char *) g_malloc0(MDB_BIND_SIZE);
row[1] = (char *) g_malloc0(MDB_BIND_SIZE);
row[2] = (char *) g_malloc0(MDB_BIND_SIZE);
row[3] = (char *) g_malloc0(MDB_BIND_SIZE);
row[4] = (char *) g_malloc0(MDB_BIND_SIZE);
row[5] = (char *) g_malloc0(MDB_BIND_SIZE);
strcpy(row[0],"");
sprintf(row[1],"%d", col->col_num+1);
strcpy(row[2],col->name);

9
src/gmdb2/debug.c
View File

@ -374,9 +374,8 @@ gmdb_debug_display(GladeXML *xml, guint32 page)
pos = lseek(mdb->f->fd, 0, SEEK_CUR);
lseek(mdb->f->fd, page * mdb->fmt->pg_size, SEEK_SET);
fbuf = (unsigned char *) malloc(mdb->fmt->pg_size);
tbuf = (unsigned char *) malloc( (mdb->fmt->pg_size / 16) * 80);
memset(tbuf, 0, (mdb->fmt->pg_size / 16) * 80);
fbuf = (unsigned char *) g_malloc(mdb->fmt->pg_size);
tbuf = (unsigned char *) g_malloc0( (mdb->fmt->pg_size / 16) * 80);
length = read(mdb->f->fd, fbuf, mdb->fmt->pg_size);
if (length<mdb->fmt->pg_size) {
}
@ -410,8 +409,8 @@ gmdb_debug_display(GladeXML *xml, guint32 page)
if (!dissect || *dissect==1)
gmdb_debug_dissect(GTK_TREE_STORE(store), fbuf, 0, length);
free(fbuf);
free(tbuf);
g_free(fbuf);
g_free(tbuf);
}
/* functions */
static long

18
src/gmdb2/table_def.c
View File

@ -97,18 +97,12 @@ GtkStyle *style;
for (i=0;i<table->num_cols;i++) {
/* display column titles */
col=g_ptr_array_index(table->columns,i);
row[0] = (char *) malloc(MDB_BIND_SIZE);
memset(row[0],0,MDB_BIND_SIZE);
row[1] = (char *) malloc(MDB_BIND_SIZE);
memset(row[1],0,MDB_BIND_SIZE);
row[2] = (char *) malloc(MDB_BIND_SIZE);
memset(row[2],0,MDB_BIND_SIZE);
row[3] = (char *) malloc(MDB_BIND_SIZE);
memset(row[3],0,MDB_BIND_SIZE);
row[4] = (char *) malloc(MDB_BIND_SIZE);
memset(row[4],0,MDB_BIND_SIZE);
row[5] = (char *) malloc(MDB_BIND_SIZE);
memset(row[5],0,MDB_BIND_SIZE);
row[0] = (char *) g_malloc0(MDB_BIND_SIZE);
row[1] = (char *) g_malloc0(MDB_BIND_SIZE);
row[2] = (char *) g_malloc0(MDB_BIND_SIZE);
row[3] = (char *) g_malloc0(MDB_BIND_SIZE);
row[4] = (char *) g_malloc0(MDB_BIND_SIZE);
row[5] = (char *) g_malloc0(MDB_BIND_SIZE);
strcpy(row[0],"");
sprintf(row[1],"%d", col->col_num+1);
strcpy(row[2],col->name);