fix off-by-one errors in fsremap/src/arch/mem_linux.cc

Author: cosmos72

fsremap/src/arch/mem_linux.cc

@@ -29,33 +29,31 @@
 #include "mem_linux.hh"
 
 #if defined(FT_HAVE_ERRNO_H)
-# include <errno.h>      // for errno
+#include <errno.h> // for errno
 #elif defined(FT_HAVE_CERRNO)
-# include <cerrno>       // for errno
+#include <cerrno> // for errno
 #endif
 #if defined(FT_HAVE_STDIO_H)
-# include <stdio.h>      // for FILE, fopen(), fclose()
+#include <stdio.h> // for FILE, fopen(), fclose()
 #elif defined(FT_HAVE_CSTDIO)
-# include <cstdio>       // for FILE, fopen(), fclose()
+#include <cstdio> // for FILE, fopen(), fclose()
 #endif
 #if defined(FT_HAVE_STRING_H)
-# include <string.h>     // for strcmp()
+#include <string.h> // for strcmp()
 #elif defined(FT_HAVE_CSTRING)
-# include <cstring>      // for strcmp()
+#include <cstring> // for strcmp()
 #endif
 
-
 #include "../log.hh" // for ff_log()
 
-
 FT_ARCH_NAMESPACE_BEGIN
 
 /**
  * return an approximation of free system memory in bytes,
  * or 0 if cannot be determined
  */
 ft_uoff ff_arch_linux_mem_system_free() {
-    FILE * f = fopen("/proc/meminfo", "r");
+    FILE *f = fopen("/proc/meminfo", "r");
     if (f == NULL) {
         ff_log(FC_WARN, errno, "failed to open /proc/meminfo, maybe /proc is not mounted?");
         return 0;
@@ -67,7 +65,7 @@ ft_uoff ff_arch_linux_mem_system_free() {
     int err;
 
     while (left != 0) {
-        if ((err = fscanf(f, "%256s %" FT_ULL " %8s\n", label, & n_ull, unit)) <= 0) {
+        if ((err = fscanf(f, "%255s %" FT_ULL " %7s\n", label, &n_ull, unit)) <= 0) {
             if (ferror(f))
                 ff_log(FC_WARN, errno, "error reading /proc/meminfo");
             break;
@@ -81,25 +79,43 @@ ft_uoff ff_arch_linux_mem_system_free() {
         if (strcmp(label, "MemFree:") && strcmp(label, "Buffers:") && strcmp(label, "Cached:"))
             continue;
         switch (unit[0]) {
-            case 'k': scale = 10; break; // 2^10 = 1k
-            case 'M': scale = 20; break; // 2^20 = 1M
-            case 'G': scale = 30; break; // 2^30 = 1G
-            case 'T': scale = 40; break; // 2^40 = 1T
-            case 'P': scale = 50; break; // 2^50 = 1P
-            case 'E': scale = 60; break; // 2^60 = 1E
-            case 'Z': scale = 70; break; // 2^70 = 1Z
-            case 'Y': scale = 80; break; // 2^80 = 1Y
-            default: scale = 0; break;
+        case 'k':
+            scale = 10;
+            break; // 2^10 = 1k
+        case 'M':
+            scale = 20;
+            break; // 2^20 = 1M
+        case 'G':
+            scale = 30;
+            break; // 2^30 = 1G
+        case 'T':
+            scale = 40;
+            break; // 2^40 = 1T
+        case 'P':
+            scale = 50;
+            break; // 2^50 = 1P
+        case 'E':
+            scale = 60;
+            break; // 2^60 = 1E
+        case 'Z':
+            scale = 70;
+            break; // 2^70 = 1Z
+        case 'Y':
+            scale = 80;
+            break; // 2^80 = 1Y
+        default:
+            scale = 0;
+            break;
         }
         /* overflow? then approximate.. */
-        if (scale >= 8*sizeof(ft_ull) || n_ull > (ft_ull)-1 >> scale)
+        if (scale >= 8 * sizeof(ft_ull) || n_ull > (ft_ull)-1 >> scale)
             n_ull = (ft_ull)-1;
         else
             n_ull <<= scale;
 
-        n = (ft_uoff) n_ull;
+        n = (ft_uoff)n_ull;
         /* overflow? then approximate.. */
-        if ((ft_ull) n != n_ull || n > (ft_uoff)-1 - total) {
+        if ((ft_ull)n != n_ull || n > (ft_uoff)-1 - total) {
             total = (ft_uoff)-1;
             break;
         }
@@ -113,6 +129,4 @@ ft_uoff ff_arch_linux_mem_system_free() {
 
 FT_ARCH_NAMESPACE_END
 
-
 #endif /* __linux__ */
-