From 3919356baf9635c7cfa2f2bf77cc5b66da672cc2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 Feb 2017 00:58:52 +0100
Subject: [PATCH 1/1] CHG: 64?
---
client/fpga_compress.c | 7 +++----
client/reveng/model.c | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index c1302694..fb3d7193 100644
--- a/client/fpga_compress.c
+++ b/client/fpga_compress.c
@@ -67,8 +67,7 @@ static bool all_feof(FILE *infile[], uint8_t num_infiles)
if (!feof(infile[i])) {
return false;
}
- }
-
+ }
return true;
}
@@ -88,7 +87,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
do {
if (i >= num_infiles * FPGA_CONFIG_SIZE) {
- fprintf(stderr, "Input files too big (total > %d bytes). These are probably not PM3 FPGA config files.\n", num_infiles*FPGA_CONFIG_SIZE);
+ fprintf(stderr, "Input files too big (total > %d bytes). These are probably not PM3 FPGA config files.\n", num_infiles * FPGA_CONFIG_SIZE);
for(uint16_t j = 0; j < num_infiles; j++) {
fclose(infile[j]);
}
@@ -141,7 +140,7 @@ int zlib_compress(FILE *infile[], uint8_t num_infiles, FILE *outfile)
ret = deflate(&compressed_fpga_stream, Z_FINISH);
}
- fprintf(stderr, "compressed %u input bytes to %" PRIu32 " output bytes\n", i, compressed_fpga_stream.total_out);
+ fprintf(stderr, "compressed %u input bytes to %" PRIu64 " output bytes\n", i, compressed_fpga_stream.total_out);
if (ret != Z_STREAM_END) {
fprintf(stderr, "Error in deflate(): %d %s\n", ret, compressed_fpga_stream.msg);
diff --git a/client/reveng/model.c b/client/reveng/model.c
index 843a3c3d..8e536107 100644
--- a/client/reveng/model.c
+++ b/client/reveng/model.c
@@ -117,7 +117,7 @@ mtostr(const model_t *model) {
if((string = malloc(size))) {
sprintf(strbuf, "\"%s\"", model->name);
sprintf(string,
- "width=%" PRIu32 ""
+ "width=%" PRIu64 ""
"poly=0x%s "
"init=0x%s "
"refin=%s "
--
2.39.5