summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgabrielstedman <gabriwinter@gmail.com>2019-04-22 09:35:29 (GMT)
committergabrielstedman <gabriwinter@gmail.com>2019-04-22 09:35:29 (GMT)
commite31b6dc03ca464de55ebb403fb0ef6470d99e1a0 (patch)
tree4fed0f79422203f5ce0f32b952b037940f0d641d
parent0acebbe53dd1b15071f2c48a7b060299b5d03622 (diff)
downloadlz4-e31b6dc03ca464de55ebb403fb0ef6470d99e1a0.zip
lz4-e31b6dc03ca464de55ebb403fb0ef6470d99e1a0.tar.gz
lz4-e31b6dc03ca464de55ebb403fb0ef6470d99e1a0.tar.bz2
FR #598 - Make fileSize unsigned long long
-rw-r--r--lib/lz4frame.h4
-rw-r--r--programs/lz4io.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/lz4frame.h b/lib/lz4frame.h
index 5945647..8c07e86 100644
--- a/lib/lz4frame.h
+++ b/lib/lz4frame.h
@@ -196,10 +196,10 @@ typedef struct {
typedef struct {
LZ4F_frameInfo_t frameInfo;
const char* fileName;
- unsigned long fileSize;
+ unsigned long long fileSize;
} LZ4F_compFileInfo_t;
-#define LZ4F_INIT_FILEINFO { (LZ4F_frameInfo_t) LZ4F_INIT_FRAMEINFO, NULL, 0UL }
+#define LZ4F_INIT_FILEINFO { (LZ4F_frameInfo_t) LZ4F_INIT_FRAMEINFO, NULL, 0ULL }
/*-*********************************
* Simple compression function
diff --git a/programs/lz4io.c b/programs/lz4io.c
index 070e22a..9aa2b94 100644
--- a/programs/lz4io.c
+++ b/programs/lz4io.c
@@ -1340,10 +1340,10 @@ int LZ4IO_displayCompressedFilesInfo(const char** inFileNames, const size_t ifnI
}
if(cfinfo.frameInfo.contentSize){
ratio = (double)cfinfo.fileSize / cfinfo.frameInfo.contentSize;
- DISPLAY("%-16d\t%-20lu\t%-20llu\t%-8.4f\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize,cfinfo.frameInfo.contentSize, ratio, cfinfo.fileName);
+ DISPLAY("%-16d\t%-20llu\t%-20llu\t%-8.4f\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize,cfinfo.frameInfo.contentSize, ratio, cfinfo.fileName);
}
else{
- DISPLAY("%-16d\t%-20lu\t%-20s\t%-10s\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize, "-", "-", cfinfo.fileName);
+ DISPLAY("%-16d\t%-20llu\t%-20s\t%-10s\t%s\n",cfinfo.frameInfo.blockChecksumFlag,cfinfo.fileSize, "-", "-", cfinfo.fileName);
}
}
return op_result;