diff --git a/ChangeLog b/ChangeLog index 44bc16d..87ed25a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ Sat Jul 17 23:09:40 CDT 2004 Jeff Smith * src/libmdb/catalog.c: Clean out some stale code + * src/libmdb/data.c: Use mdb_unicode2ascii in mdb_col_to_string Sat Jul 17 09:21:13 CDT 2004 Jeff Smith * include/mdbtools.h: diff --git a/src/libmdb/data.c b/src/libmdb/data.c index aab2181..df1dab0 100644 --- a/src/libmdb/data.c +++ b/src/libmdb/data.c @@ -1047,16 +1047,7 @@ char *mdb_col_to_string(MdbHandle *mdb, unsigned char *buf, int start, int datat } fprintf(stdout, "\n"); */ - if (mdb->pg_buf[start]==0xff && - mdb->pg_buf[start+1]==0xfe) { - strncpy(text, &mdb->pg_buf[start+2], size-2); - text[size-2]='\0'; - } else { - /* convert unicode to ascii, rather sloppily */ - for (i=0;ipg_buf[start + i]; - text[size/2]='\0'; - } + mdb_unicode2ascii(mdb, mdb->pg_buf, start, size, text); } else { strncpy(text, &buf[start], size); text[size]='\0';