From 467c9381a6e6870d759adc5aeef474de5e0921b0 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Wed, 11 Jan 2012 19:12:15 +0000
Subject: [PATCH] fix printf/scanf format strings to match `unsigned long long'
 arguments

---
 ChangeLog               |  6 ++++++
 src/frontend/resource.c | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 439e79686..ee4d82ec7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
+2012-01-11  Robert Larice
+ * src/frontend/resource.c :
+  fix printf/scanf format strings to match `unsigned long long' arguments
+
 2012-01-09 Holger Vogt
  * rawfile.c: error messages, bug during
    loading ascii rawfile removed
+     plot i(vdd)
+   from a loaded rawfile is working now.
 
 2012-01-08  Robert Larice
  * src/frontend/parse-bison.c ,
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index a73d9f6ea..4263f82d2 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -487,7 +487,7 @@ fprintmem(FILE* stream, unsigned long long memory) {
     else if (memory > 1024) 
       fprintf(stream, "%5.3f kB", (double)memory / 1024.);
     else
-      fprintf(stream, "%" PRIu64 " bytes", memory);
+      fprintf(stream, "%llu bytes", memory);
 }
 
 #if defined(HAVE_WIN32) || defined(HAVE__PROC_MEMINFO) 
@@ -545,7 +545,7 @@ static int get_procm(struct proc_mem *memall) {
        return 0;
     buffer[bytes_read] = '\0';
     
-    sscanf (buffer, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, &memall->size, &memall->resident, &memall->shared, &memall->trs, &memall->drs, &memall->lrs, &memall->dt);
+    sscanf (buffer, "%llu %llu %llu %llu %llu %llu %llu", &memall->size, &memall->resident, &memall->shared, &memall->trs, &memall->drs, &memall->lrs, &memall->dt);
 #endif
    return 1;
 }
@@ -591,25 +591,25 @@ static int get_sysmem(struct sys_mem *memall) {
    match = strstr (buffer, "MemTotal");
    if (match == NULL) /* not found */
       return 0;
-   sscanf (match, "MemTotal: %" SCNu64, &mem_got);
+   sscanf (match, "MemTotal: %llu", &mem_got);
    memall->size = mem_got*1024; /* 1MB = 1024KB */
    /* Search for string "MemFree" */
    match = strstr (buffer, "MemFree");
    if (match == NULL) /* not found */
       return 0;
-   sscanf (match, "MemFree: %" SCNu64, &mem_got);
+   sscanf (match, "MemFree: %llu", &mem_got);
    memall->free = mem_got*1024; /* 1MB = 1024KB */  
    /* Search for string "SwapTotal" */
    match = strstr (buffer, "SwapTotal");
    if (match == NULL) /* not found */
       return 0;
-   sscanf (match, "SwapTotal: %" SCNu64, &mem_got);
+   sscanf (match, "SwapTotal: %llu", &mem_got);
    memall->swap_t = mem_got*1024; /* 1MB = 1024KB */
    /* Search for string "SwapFree" */
    match = strstr (buffer, "SwapFree");
    if (match == NULL) /* not found */
       return 0;
-   sscanf (match, "SwapFree: %" SCNu64, &mem_got);
+   sscanf (match, "SwapFree: %llu", &mem_got);
    memall->swap_f = mem_got*1024; /* 1MB = 1024KB */
 #endif   
    return 1;