CHG: 64?

diff --git a/client/fpga_compress.c b/client/fpga_compress.c
index c13026941362b96603ac1cfc7d5f2da609027699..fb3d71939e74c657f52471d40e19d9b0a0861b9a 100644 (file)
--- 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;
                }
                if (!feof(infile[i])) {
                        return false;
                }

-       }
-       
+       }       

        return true;
 }
 
        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) {
        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]);
                        }
                        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);
        }
        
                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);
 
        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 843a3c3dc1002ac4e0e0a59572aef49e4b6aa530..8e5361077d23e6f4d923f7cfdc90841ef2c681e0 100644 (file)
--- 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,
        if((string = malloc(size))) {
                sprintf(strbuf, "\"%s\"", model->name);
                sprintf(string,

-                               "width=%" PRIu32 ""
+                               "width=%" PRIu64 ""

                                "poly=0x%s  "
                                "init=0x%s  "
                                "refin=%s  "
                                "poly=0x%s  "
                                "init=0x%s  "
                                "refin=%s  "