lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-11-26 02:09:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make varaddr parameter a void *

Browse Source
This commit is contained in:
whydoubt
2005-10-17 12:10:07 +00:00
parent 8b9438dff5
commit a5094f778d
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -3,6 +3,8 @@ Mon Oct 17 06:25:44 CDT 2005 Jeff Smith <whydoubt@yahoo.com>
* HACKING: Correct info about MDBICONV * HACKING: Correct info about MDBICONV
* include/mdbtools.h: * include/mdbtools.h:
* src/libmdb/backend.c: Make backend_name parameter a const char * * src/libmdb/backend.c: Make backend_name parameter a const char *
* include/mdbsql.h:
* src/sql/mdbsql.c: Make varaddr parameter a void *
Wed Sep 7 08:28:28 EDT 2005 Brian Bruns <brian@bruns.com> Wed Sep 7 08:28:28 EDT 2005 Brian Bruns <brian@bruns.com>
* src/util/mdb-export.c: Add -q and -X flags. Make -R and -d handle escaped characters properly * src/util/mdb-export.c: Add -q and -X flags. Make -R and -d handle escaped characters properly

5
include/mdbsql.h
View File

@@ -21,7 +21,7 @@ typedef struct {
MdbSargNode *sarg_tree; MdbSargNode *sarg_tree;
GList *sarg_stack; GList *sarg_stack;
/* FIX ME */ /* FIX ME */
char *bound_values[256]; void *bound_values[256];
unsigned char *kludge_ttable_pg; unsigned char *kludge_ttable_pg;
long max_rows; long max_rows;
} MdbSQL; } MdbSQL;
@@ -68,7 +68,6 @@ extern void mdb_sql_dump_node(MdbSargNode *node, int level);
extern void mdb_sql_close(MdbSQL *sql); extern void mdb_sql_close(MdbSQL *sql);
extern void mdb_sql_add_or(MdbSQL *sql); extern void mdb_sql_add_or(MdbSQL *sql);
extern void mdb_sql_add_and(MdbSQL *sql); extern void mdb_sql_add_and(MdbSQL *sql);
extern void mdb_sql_listtables(MdbSQL *sql);
extern void mdb_sql_add_not(MdbSQL *sql); extern void mdb_sql_add_not(MdbSQL *sql);
extern void mdb_sql_describe_table(MdbSQL *sql); extern void mdb_sql_describe_table(MdbSQL *sql);
extern MdbSQL* mdb_sql_run_query (MdbSQL*, const gchar*); extern MdbSQL* mdb_sql_run_query (MdbSQL*, const gchar*);
@@ -77,7 +76,7 @@ extern int mdb_sql_eval_expr(MdbSQL *sql, char *const1, int op, char *const2);
extern void mdb_sql_bind_all(MdbSQL *sql); extern void mdb_sql_bind_all(MdbSQL *sql);
extern int mdb_sql_fetch_row(MdbSQL *sql, MdbTableDef *table); extern int mdb_sql_fetch_row(MdbSQL *sql, MdbTableDef *table);
extern int mdb_sql_add_temp_col(MdbSQL *sql, MdbTableDef *ttable, int col_num, char *name, int col_type, int col_size, int is_fixed); extern int mdb_sql_add_temp_col(MdbSQL *sql, MdbTableDef *ttable, int col_num, char *name, int col_type, int col_size, int is_fixed);
extern void mdb_sql_bind_column(MdbSQL *sql, int colnum, char *varaddr, int *len_ptr); extern void mdb_sql_bind_column(MdbSQL *sql, int colnum, void *varaddr, int *len_ptr);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
src/sql/mdbsql.c
View File

@@ -714,7 +714,7 @@ int found = 0;
} }
void void
mdb_sql_bind_column(MdbSQL *sql, int colnum, char *varaddr, int *len_ptr) mdb_sql_bind_column(MdbSQL *sql, int colnum, void *varaddr, int *len_ptr)
{ {
MdbSQLColumn *sqlcol; MdbSQLColumn *sqlcol;
@@ -728,7 +728,7 @@ mdb_sql_bind_all(MdbSQL *sql)
unsigned int i; unsigned int i;
for (i=0;i<sql->num_columns;i++) { for (i=0;i<sql->num_columns;i++) {
sql->bound_values[i] = (char *) g_malloc0(MDB_BIND_SIZE); sql->bound_values[i] = g_malloc0(MDB_BIND_SIZE);
mdb_sql_bind_column(sql, i+1, sql->bound_values[i], NULL); mdb_sql_bind_column(sql, i+1, sql->bound_values[i], NULL);
} }
} }