lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-01-02 20:42:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of more static memory

Browse Source 
* Replace backend_is_init (formerly is_init) with relationships_table

* Remove deprecated functions that used static variables

* Move static "bound" variable to MdbHandle as relationships_values
This commit is contained in:
Evan Miller
2020-08-20 08:47:13 -04:00
parent 588663675e
commit 452cd29343
2 changed files with 28 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/mdbtools.h
View File

@@ -272,7 +272,8 @@ typedef struct {
GPtrArray *catalog; GPtrArray *catalog;
MdbBackend *default_backend; MdbBackend *default_backend;
char *backend_name; char *backend_name;
int backend_is_init; struct S_MdbTableDef *relationships_table;
char *relationships_values[5];
MdbFormatConstants *fmt; MdbFormatConstants *fmt;
MdbStatistics *stats; MdbStatistics *stats;
char date_fmt[64]; char date_fmt[64];

95
src/libmdb/backend.c
View File

@@ -263,35 +263,6 @@ static int mdb_col_is_shortdate(const MdbColumn *col) {
return format && !strcmp(format, "Short Date"); return format && !strcmp(format, "Short Date");
} }
MDB_DEPRECATED(char*,
mdb_get_coltype_string(MdbBackend *backend, int col_type))
{
static int warn_deprecated = 0;
static char buf[16];
if (!warn_deprecated) {
warn_deprecated = 1;
fprintf(stderr, "mdb_get_coltype_string is deprecated. Use mdb_get_colbacktype_string.\n");
}
if (col_type > 0x10 ) {
// return NULL;
snprintf(buf,sizeof(buf), "type %04x", col_type);
return buf;
} else
return backend->types_table[col_type].name;
}
MDB_DEPRECATED(int,
mdb_coltype_takes_length(MdbBackend *backend, int col_type))
{
static int warn_deprecated = 0;
if (!warn_deprecated) {
warn_deprecated = 1;
fprintf(stderr, "mdb_coltype_takes_length is deprecated. Use mdb_colbacktype_takes_length.\n");
}
return backend->types_table[col_type].needs_length;
}
const MdbBackendType* const MdbBackendType*
mdb_get_colbacktype(const MdbColumn *col) { mdb_get_colbacktype(const MdbColumn *col) {
MdbBackend *backend = col->table->entry->mdb->default_backend; MdbBackend *backend = col->table->entry->mdb->default_backend;
@@ -313,8 +284,8 @@ mdb_get_colbacktype_string(const MdbColumn *col)
const MdbBackendType *type = mdb_get_colbacktype(col); const MdbBackendType *type = mdb_get_colbacktype(col);
if (!type) { if (!type) {
// return NULL; // return NULL;
static char buf[16]; static __thread char buf[16];
snprintf(buf,sizeof(buf), "type %04x", col->col_type); snprintf(buf, sizeof(buf), "type %04x", col->col_type);
return buf; return buf;
} }
return type->name; return type->name;
@@ -463,7 +434,7 @@ int mdb_set_default_backend(MdbHandle *mdb, const char *backend_name)
mdb->default_backend = backend; mdb->default_backend = backend;
g_free(mdb->backend_name); // NULL is ok g_free(mdb->backend_name); // NULL is ok
mdb->backend_name = (char *) g_strdup(backend_name); mdb->backend_name = (char *) g_strdup(backend_name);
mdb->backend_is_init = 0; mdb->relationships_table = NULL;
return 1; return 1;
} else { } else {
return 0; return 0;
@@ -629,8 +600,7 @@ mdb_get_relationships(MdbHandle *mdb, const gchar *dbnamespace, const char* tabl
{ {
unsigned int i; unsigned int i;
gchar *text = NULL; /* String to be returned */ gchar *text = NULL; /* String to be returned */
static char *bound[5]; /* Bound values */ char **bound = mdb->relationships_values; /* Bound values */
static MdbTableDef *table; /* Relationships table */
int backend = 0; int backend = 0;
char *quoted_table_1, *quoted_column_1, char *quoted_table_1, *quoted_column_1,
*quoted_table_2, *quoted_column_2, *quoted_table_2, *quoted_column_2,
@@ -643,55 +613,42 @@ mdb_get_relationships(MdbHandle *mdb, const gchar *dbnamespace, const char* tabl
backend = MDB_BACKEND_POSTGRES; backend = MDB_BACKEND_POSTGRES;
} else if (!strcmp(mdb->backend_name, "sqlite")) { } else if (!strcmp(mdb->backend_name, "sqlite")) {
backend = MDB_BACKEND_SQLITE; backend = MDB_BACKEND_SQLITE;
} else { } else if (!mdb->relationships_table) {
if (mdb->backend_is_init == 0) { /* the first time through */ return (char *) g_strconcat(
mdb->backend_is_init = 1; "-- relationships are not implemented for ",
return (char *) g_strconcat( mdb->backend_name, "\n", NULL);
"-- relationships are not implemented for ",
mdb->backend_name, "\n", NULL);
} else { /* the second time through */
mdb->backend_is_init = 0;
return NULL;
}
} }
if (mdb->backend_is_init == 0) { if (!mdb->relationships_table) {
table = mdb_read_table_by_name(mdb, "MSysRelationships", MDB_TABLE); mdb->relationships_table = mdb_read_table_by_name(mdb, "MSysRelationships", MDB_TABLE);
if ((!table) || (table->num_rows == 0)) { if (!mdb->relationships_table || !mdb->relationships_table->num_rows) {
fprintf(stderr, "No MSysRelationships\n"); fprintf(stderr, "No MSysRelationships\n");
return NULL; return NULL;
} }
mdb_read_columns(table); mdb_read_columns(mdb->relationships_table);
for (i=0;i<5;i++) { for (i=0;i<5;i++) {
bound[i] = (char *) g_malloc0(MDB_BIND_SIZE); bound[i] = (char *) g_malloc0(MDB_BIND_SIZE);
} }
mdb_bind_column_by_name(table, "szColumn", bound[0], NULL); mdb_bind_column_by_name(mdb->relationships_table, "szColumn", bound[0], NULL);
mdb_bind_column_by_name(table, "szObject", bound[1], NULL); mdb_bind_column_by_name(mdb->relationships_table, "szObject", bound[1], NULL);
mdb_bind_column_by_name(table, "szReferencedColumn", bound[2], NULL); mdb_bind_column_by_name(mdb->relationships_table, "szReferencedColumn", bound[2], NULL);
mdb_bind_column_by_name(table, "szReferencedObject", bound[3], NULL); mdb_bind_column_by_name(mdb->relationships_table, "szReferencedObject", bound[3], NULL);
mdb_bind_column_by_name(table, "grbit", bound[4], NULL); mdb_bind_column_by_name(mdb->relationships_table, "grbit", bound[4], NULL);
mdb_rewind_table(table); mdb_rewind_table(mdb->relationships_table);
mdb->backend_is_init = 1;
}
else {
if (!table) {
fprintf(stderr, "table is NULL\n");
}
if (table->cur_row >= table->num_rows) { /* past the last row */
for (i=0;i<5;i++)
g_free(bound[i]);
mdb->backend_is_init = 0;
return NULL;
}
} }
if (mdb->relationships_table->cur_row >= mdb->relationships_table->num_rows) { /* past the last row */
for (i=0;i<5;i++)
g_free(bound[i]);
mdb->relationships_table = NULL;
return NULL;
}
while (1) { while (1) {
if (!mdb_fetch_row(table)) { if (!mdb_fetch_row(mdb->relationships_table)) {
for (i=0;i<5;i++) for (i=0;i<5;i++)
g_free(bound[i]); g_free(bound[i]);
mdb->backend_is_init = 0; mdb->relationships_table = NULL;
return NULL; return NULL;
} }
if (!tablename || !strcmp(bound[1], tablename)) if (!tablename || !strcmp(bound[1], tablename))