Portability and Bugfixes

1 files changed, 7 insertions, 8 deletions

diff --git a/src/cdf.c b/src/cdf.c
index 2b26e27..385ff21 100644
--- a/src/cdf.c
+++ b/src/cdf.c
@@ -73,11 +73,11 @@ static DistRecord *expand_array(DistRecord *records, size_t *capacity) {
 
 static int parse_line(DistRecord *record, char *line) {
   if (ARG_FP_INPUT) {
-    return sscanf(line, "%lld %lf", &record->count, &record->data.d);
+    return sscanf(line, "%" SCNu64 " %lf", &record->count, &record->data.d);
   } else if (ARG_UINT_INPUT) {
-    return sscanf(line, "%lld %llu", &record->count, &record->data.u);
+    return sscanf(line, "%" SCNu64 " %" SCNu64, &record->count, &record->data.u);
   } else {
-    return sscanf(line, "%lld %lld", &record->count, &record->data.i);
+    return sscanf(line, "%" SCNu64 " %" SCNd64, &record->count, &record->data.i);
   }
 }
 
@@ -107,9 +107,9 @@ static void print_record(long double freq, DistRecord *record) {
   if (ARG_FP_INPUT) {
     fprintf(stdout, "%.15Lf\t%lf\n", freq, record->data.d);
   } else if (ARG_UINT_INPUT) {
-    fprintf(stdout, "%.15Lf\t%llu\n", freq, record->data.u);
+    fprintf(stdout, "%.15Lf\t%" PRIu64 "\n", freq, record->data.u);
   } else {
-    fprintf(stdout, "%.15Lf\t%lld\n", freq, record->data.i);
+    fprintf(stdout, "%.15Lf\t%" PRId64 "\n", freq, record->data.i);
   }
 }
 
@@ -150,7 +150,7 @@ static int process_data(FILE *file) {
 
   /* calculate total sum of counts */
   uint64_t total_count = 0;
-  for (size_t i = 0; i < cnt; i++) {
+  for (size_t i = 0; i < (size_t)cnt; i++) {
     total_count += records[i].count;
   }
 
@@ -161,7 +161,7 @@ static int process_data(FILE *file) {
     goto free_freqs;
   }
 
-  for (size_t i = 0; i < cnt; i++) {
+  for (size_t i = 0; i < (size_t)cnt; i++) {
     freqs[i] = (long double)(records[i].count) / (long double)(total_count);
   }
 
@@ -209,7 +209,6 @@ int main(int argc, char **argv) {
     rc = EXIT_FAILURE;
   }
 
-close_file:
   if (input_file != stdin) {
     fclose(input_file);
   }