lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-06-28 15:39:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use correct parameter in mdb_col_to_string

Browse Source
This commit is contained in:
whydoubt 2005-10-17 12:11:57 +00:00
parent a5094f778d
commit 54bc9c81c6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -5,6 +5,7 @@ Mon Oct 17 06:25:44 CDT 2005 Jeff Smith <whydoubt@yahoo.com>
* 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: * include/mdbsql.h:
* src/sql/mdbsql.c: Make varaddr parameter a void * * src/sql/mdbsql.c: Make varaddr parameter a void *
* src/libmdb/data.c: Use correct parameter in mdb_col_to_string
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

9
src/libmdb/data.c
View File

@ -807,10 +807,9 @@ int floor_log10(double f, int is_single)
char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int size) char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int size)
{ {
char *text; char *text = NULL;
float tf; float tf;
double td; double td;
void *pg_buf = mdb->pg_buf;
switch (datatype) { switch (datatype) {
case MDB_BOOL: case MDB_BOOL:
@ -829,13 +828,13 @@ char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int
mdb_get_int32(buf, start)); mdb_get_int32(buf, start));
break; break;
case MDB_FLOAT: case MDB_FLOAT:
tf = mdb_get_single(pg_buf, start); tf = mdb_get_single(buf, start);
text = g_strdup_printf("%.*f", text = g_strdup_printf("%.*f",
FLT_DIG - floor_log10(tf,1) - 1, tf); FLT_DIG - floor_log10(tf,1) - 1, tf);
trim_trailing_zeros(text); trim_trailing_zeros(text);
break; break;
case MDB_DOUBLE: case MDB_DOUBLE:
td = mdb_get_double(pg_buf, start); td = mdb_get_double(buf, start);
text = g_strdup_printf("%.*f", text = g_strdup_printf("%.*f",
DBL_DIG - floor_log10(td,0) - 1, td); DBL_DIG - floor_log10(td,0) - 1, td);
trim_trailing_zeros(text); trim_trailing_zeros(text);
@ -845,7 +844,7 @@ char *mdb_col_to_string(MdbHandle *mdb, void *buf, int start, int datatype, int
text = g_strdup(""); text = g_strdup("");
} else { } else {
text = (char *) g_malloc(MDB_BIND_SIZE); text = (char *) g_malloc(MDB_BIND_SIZE);
mdb_unicode2ascii(mdb, pg_buf + start, mdb_unicode2ascii(mdb, buf + start,
size, text, MDB_BIND_SIZE); size, text, MDB_BIND_SIZE);
} }
break; break;