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

Clean up some warnings

Browse Source
This commit is contained in:
whydoubt 2005-03-22 13:04:12 +00:00
parent 5926d50e2c
commit a2c849ca8c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Mar 22 07:01:37 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/extras/mdb-dump.c:
* src/libmdb/data.c: Clean up some warnings
Sat Mar 19 06:34:00 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* src/libmdb/Makefile.am:
* src/libmdb/data.c: Clean up printing of floating-point values
Wed Mar 16 06:41:57 CST 2005 Jeff Smith <whydoubt@yahoo.com> Wed Mar 16 06:41:57 CST 2005 Jeff Smith <whydoubt@yahoo.com>
* include/mdbtools.h: * include/mdbtools.h:
* src/libmdb/data.c: Improve OLE-related functions * src/libmdb/data.c: Improve OLE-related functions

6
src/extras/mdb-dump.c
View File

@ -18,11 +18,11 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
long i=0; unsigned long i=0;
int j; unsigned int j;
unsigned char data[17]; unsigned char data[17];
FILE *in; FILE *in;
int length; size_t length;
int pg=0; int pg=0;
char addr[10]; char addr[10];
int jet4 = 0; int jet4 = 0;

10
src/libmdb/data.c
View File

@ -442,7 +442,7 @@ mdb_ole_read_next(MdbHandle *mdb, MdbColumn *col, void *ole_ptr)
{ {
guint32 ole_len; guint32 ole_len;
char *buf; char *buf;
int pg_row, row_start; int row_start;
int len; int len;
ole_len = mdb_get_int32(ole_ptr, 0); ole_len = mdb_get_int32(ole_ptr, 0);
@ -469,7 +469,7 @@ mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size)
{ {
guint32 ole_len; guint32 ole_len;
char *buf; char *buf;
int pg_row, row_start; int row_start;
int len; int len;
ole_len = mdb_get_int32(ole_ptr, 0); ole_len = mdb_get_int32(ole_ptr, 0);
@ -509,7 +509,7 @@ mdb_ole_read(MdbHandle *mdb, MdbColumn *col, void *ole_ptr, int chunk_size)
buffer_dump(col->bind_ptr, 0, 16); buffer_dump(col->bind_ptr, 0, 16);
} }
return len; return len;
} else if (ole_len & 0xff000000 == 0) { } else if ((ole_len & 0xff000000) == 0) {
col->cur_blob_pg_row = mdb_get_int32(ole_ptr, 4); col->cur_blob_pg_row = mdb_get_int32(ole_ptr, 4);
if (mdb_find_pg_row(mdb, col->cur_blob_pg_row, if (mdb_find_pg_row(mdb, col->cur_blob_pg_row,
@ -561,7 +561,7 @@ int mdb_copy_ole(MdbHandle *mdb, char *dest, int start, int size)
if (dest) if (dest)
memcpy(dest, buf + row_start, len); memcpy(dest, buf + row_start, len);
return len; return len;
} else if (ole_len & 0xff000000 == 0) { // assume all flags in MSB } else if ((ole_len & 0xff000000) == 0) { // assume all flags in MSB
/* multi-page */ /* multi-page */
int cur = 0; int cur = 0;
pg_row = mdb_get_int32(pg_buf, start+4); pg_row = mdb_get_int32(pg_buf, start+4);
@ -634,7 +634,7 @@ static char *mdb_memo_to_string(MdbHandle *mdb, int start, int size)
#endif #endif
mdb_unicode2ascii(mdb, buf + row_start, len, text, MDB_BIND_SIZE); mdb_unicode2ascii(mdb, buf + row_start, len, text, MDB_BIND_SIZE);
return text; return text;
} else if (memo_len & 0xff000000 == 0) { // assume all flags in MSB } else if ((memo_len & 0xff000000) == 0) { // assume all flags in MSB
/* multi-page memo field */ /* multi-page memo field */
guint32 tmpoff = 0; guint32 tmpoff = 0;
char *tmp; char *tmp;