From 54bc9c81c6150dee1afb20237cf5bf663bcdcdef Mon Sep 17 00:00:00 2001 From: whydoubt Date: Mon, 17 Oct 2005 12:11:57 +0000 Subject: [PATCH] Use correct parameter in mdb_col_to_string --- ChangeLog | 1 + src/libmdb/data.c | 9 ++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index fece299..159c93f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ Mon Oct 17 06:25:44 CDT 2005 Jeff Smith * src/libmdb/backend.c: Make backend_name parameter a const char * * include/mdbsql.h: * 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 * src/util/mdb-export.c: Add -q and -X flags. Make -R and -d handle escaped characters properly diff --git a/src/libmdb/data.c b/src/libmdb/data.c index f8c53a7..b78a90b 100644 --- a/src/libmdb/data.c +++ b/src/libmdb/data.c @@ -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 *text; + char *text = NULL; float tf; double td; - void *pg_buf = mdb->pg_buf; switch (datatype) { 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)); break; case MDB_FLOAT: - tf = mdb_get_single(pg_buf, start); + tf = mdb_get_single(buf, start); text = g_strdup_printf("%.*f", FLT_DIG - floor_log10(tf,1) - 1, tf); trim_trailing_zeros(text); break; case MDB_DOUBLE: - td = mdb_get_double(pg_buf, start); + td = mdb_get_double(buf, start); text = g_strdup_printf("%.*f", DBL_DIG - floor_log10(td,0) - 1, td); 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(""); } else { text = (char *) g_malloc(MDB_BIND_SIZE); - mdb_unicode2ascii(mdb, pg_buf + start, + mdb_unicode2ascii(mdb, buf + start, size, text, MDB_BIND_SIZE); } break;