fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-03 00:01:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors and add warning for 32-bit platforms

Browse Source
This commit is contained in:
Pieter Noordhuis 2010-08-31 13:06:26 +02:00
parent 7b30cc3a7b
commit f85202c3dc
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/redis-check-dump.c
View File

@ -65,8 +65,8 @@
/* data type to hold offset in file and size */ /* data type to hold offset in file and size */
typedef struct { typedef struct {
void *data; void *data;
uint64_t size; size_t size;
uint64_t offset; size_t offset;
} pos; } pos;
static unsigned char level = 0; static unsigned char level = 0;
@ -77,8 +77,8 @@ static pos positions[16];
/* Hold a stack of errors */ /* Hold a stack of errors */
typedef struct { typedef struct {
char error[16][1024]; char error[16][1024];
uint64_t offset[16]; size_t offset[16];
uint32_t level; size_t level;
} errors_t; } errors_t;
static errors_t errors; static errors_t errors;
@ -112,7 +112,7 @@ int readBytes(void *target, long num) {
if (p.offset + num > p.size) { if (p.offset + num > p.size) {
return 0; return 0;
} else { } else {
memcpy(target, (void*)((unsigned long)p.data + p.offset), num); memcpy(target, (void*)((size_t)p.data + p.offset), num);
if (!peek) positions[level].offset += num; if (!peek) positions[level].offset += num;
} }
return 1; return 1;
@ -536,7 +536,7 @@ void printErrorStack(entry *e) {
/* display error stack */ /* display error stack */
for (i = 0; i < errors.level; i++) { for (i = 0; i < errors.level; i++) {
printf("0x%08llx - %s\n", errors.offset[i], errors.error[i]); printf("0x%08lx - %s\n", errors.offset[i], errors.error[i]);
} }
} }
@ -622,7 +622,7 @@ int main(int argc, char **argv) {
} }
int fd; int fd;
size_t size; off_t size;
struct stat stat; struct stat stat;
void *data; void *data;
@ -636,6 +636,10 @@ int main(int argc, char **argv) {
size = stat.st_size; size = stat.st_size;
} }
if (sizeof(size_t) == sizeof(int32_t) && size >= INT_MAX) {
ERROR("Cannot check dump files >2GB on a 32-bit platform\n");
}
data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0); data = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
if (data == MAP_FAILED) { if (data == MAP_FAILED) {
ERROR("Cannot mmap: %s\n", argv[1]); ERROR("Cannot mmap: %s\n", argv[1]);