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

printf portability fixes

Browse Source
This commit is contained in:
Evan Miller
2020-08-04 17:24:04 -04:00
parent 8755c26637
commit 446b92b2c8
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libmdb/file.c
View File

@@ -372,7 +372,7 @@ static ssize_t _mdb_read_pg(MdbHandle *mdb, void *pg_buf, unsigned long pg)
fstat(mdb->f->fd, &status); fstat(mdb->f->fd, &status);
if (status.st_size < offset) { if (status.st_size < offset) {
fprintf(stderr,"offset %jd is beyond EOF\n",(intmax_t)offset); fprintf(stderr,"offset %lld is beyond EOF\n",(long long)offset);
return 0; return 0;
} }
if (mdb->stats && mdb->stats->collect) if (mdb->stats && mdb->stats->collect)

22
src/libmdb/props.c
View File

@@ -133,14 +133,20 @@ mdb_read_props(MdbHandle *mdb, GPtrArray *names, gchar *kkd, int len)
g_strdup(kkd[pos + 8] ? "yes" : "no")); g_strdup(kkd[pos + 8] ? "yes" : "no"));
} else if (dtype == MDB_BINARY && dsize == 16 && strcmp(name, "GUID") == 0) { } else if (dtype == MDB_BINARY && dsize == 16 && strcmp(name, "GUID") == 0) {
gchar *guid = g_malloc0(39); gchar *guid = g_malloc0(39);
snprintf(guid, 39, "{%02hhX%02hhX%02hhX%02hhX" "-" "%02hhX%02hhX" snprintf(guid, 39, "{%02X%02X%02X%02X" "-" "%02X%02X" "-" "%02X%02X"
"-" "%02hhX%02hhX" "-" "%02hhX%02hhX" "-" "%02X%02X" "%02X%02X%02X%02X%02X%02X}",
"%02hhX%02hhX%02hhX%02hhX%02hhX%02hhX}", (unsigned char)kkd[pos+11], (unsigned char)kkd[pos+10],
kkd[pos+11], kkd[pos+10], kkd[pos+9], kkd[pos+8], // little-endian (unsigned char)kkd[pos+9], (unsigned char)kkd[pos+8], // little-endian
kkd[pos+13], kkd[pos+12], // little-endian
kkd[pos+15], kkd[pos+14], // little-endian (unsigned char)kkd[pos+13], (unsigned char)kkd[pos+12], // little-endian
kkd[pos+16], kkd[pos+17], // big-endian
kkd[pos+18], kkd[pos+19], kkd[pos+20], kkd[pos+21], kkd[pos+22], kkd[pos+23]); (unsigned char)kkd[pos+15], (unsigned char)kkd[pos+14], // little-endian
(unsigned char)kkd[pos+16], (unsigned char)kkd[pos+17], // big-endian
(unsigned char)kkd[pos+18], (unsigned char)kkd[pos+19],
(unsigned char)kkd[pos+20], (unsigned char)kkd[pos+21],
(unsigned char)kkd[pos+22], (unsigned char)kkd[pos+23]); // big-endian
g_hash_table_insert(props->hash, g_strdup(name), guid); g_hash_table_insert(props->hash, g_strdup(name), guid);
} else { } else {
g_hash_table_insert(props->hash, g_strdup(name), g_hash_table_insert(props->hash, g_strdup(name),

2
src/libmdb/write.c
View File

@@ -81,7 +81,7 @@ mdb_write_pg(MdbHandle *mdb, unsigned long pg)
fstat(mdb->f->fd, &status); fstat(mdb->f->fd, &status);
/* is page beyond current size + 1 ? */ /* is page beyond current size + 1 ? */
if (status.st_size < offset + mdb->fmt->pg_size) { if (status.st_size < offset + mdb->fmt->pg_size) {
fprintf(stderr,"offset %jd is beyond EOF\n",(intmax_t)offset); fprintf(stderr,"offset %lld is beyond EOF\n",(long long)offset);
return 0; return 0;
} }
lseek(mdb->f->fd, offset, SEEK_SET); lseek(mdb->f->fd, offset, SEEK_SET);