Changeset 11385 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 13, 2008 12:26:24 PM (16 years ago)

Author:

vboxsync

Message:

PerfAPI: Fixed warnings in fscanf calls

File:

• trunk/src/VBox/Main/linux/PerformanceLinux.cpp (modified) (4 diffs)

trunk/src/VBox/Main/linux/PerformanceLinux.cpp

@@ -62 +62 @@
     if (f)
     {
-        if (fscanf(f, "cpu %lu %lu %lu %lu", &u32user, &u32nice, &u32kernel, &u32idle) == 4)
+        if (fscanf(f, "cpu %u %u %u %u", &u32user, &u32nice, &u32kernel, &u32idle) == 4)
         {
             *user   = (uint64_t)u32user + u32nice;
@@ -107 +107 @@
     if (f)
     {
-        int processed = fscanf(f, "MemTotal: %lu kB\n", total);
-        processed    += fscanf(f, "MemFree: %lu kB\n", available);
-        processed    += fscanf(f, "Buffers: %lu kB\n", &buffers);
-        processed    += fscanf(f, "Cached: %lu kB\n", &cached);
+        int processed = fscanf(f, "MemTotal: %u kB\n", total);
+        processed    += fscanf(f, "MemFree: %u kB\n", available);
+        processed    += fscanf(f, "Buffers: %u kB\n", &buffers);
+        processed    += fscanf(f, "Cached: %u kB\n", &cached);
         if (processed == 4)
         {
@@ -148 +148 @@
     uint64_t u64Tmp;
     unsigned uTmp;
-    ULONG ulTmp, u32user, u32kernel;
+    unsigned long ulTmp;
+    ULONG u32user, u32kernel;
     char buf[80]; /* @todo: this should be tied to max allowed proc name. */
 
@@ -158 +159 @@
     if (f)
     {
-        if (fscanf(f, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %lu %lu "
-                      "%ld %ld %ld %ld %ld %ld %llu %lu %ld",
+        if (fscanf(f, "%d %s %c %d %d %d %d %d %u %lu %lu %lu %lu %u %u "
+                      "%ld %ld %ld %ld %ld %ld %llu %lu %u",
                    &pid2, buf, &c, &iTmp, &iTmp, &iTmp, &iTmp, &iTmp, &uTmp,
                    &ulTmp, &ulTmp, &ulTmp, &ulTmp, &u32user, &u32kernel,