Changes in kernel/generic/src/lib/str.c [933cadf:4ce914d4] in mainline

File:

• kernel/generic/src/lib/str.c (modified) (2 diffs)

kernel/generic/src/lib/str.c

@@ -922 +922 @@
 void order_suffix(const uint64_t val, uint64_t *rv, char *suffix)
 {
-        if (val > UINT64_C(10000000000000000000)) {
-                *rv = val / UINT64_C(1000000000000000000);
+        if (val > 10000000000000000000ULL) {
+                *rv = val / 1000000000000000000ULL;
                 *suffix = 'Z';
-        } else if (val > UINT64_C(1000000000000000000)) {
-                *rv = val / UINT64_C(1000000000000000);
+        } else if (val > 1000000000000000000ULL) {
+                *rv = val / 1000000000000000ULL;
                 *suffix = 'E';
-        } else if (val > UINT64_C(1000000000000000)) {
-                *rv = val / UINT64_C(1000000000000);
+        } else if (val > 1000000000000000ULL) {
+                *rv = val / 1000000000000ULL;
                 *suffix = 'T';
-        } else if (val > UINT64_C(1000000000000)) {
-                *rv = val / UINT64_C(1000000000);
+        } else if (val > 1000000000000ULL) {
+                *rv = val / 1000000000ULL;
                 *suffix = 'G';
-        } else if (val > UINT64_C(1000000000)) {
-                *rv = val / UINT64_C(1000000);
+        } else if (val > 1000000000ULL) {
+                *rv = val / 1000000ULL;
                 *suffix = 'M';
-        } else if (val > UINT64_C(1000000)) {
-                *rv = val / UINT64_C(1000);
+        } else if (val > 1000000ULL) {
+                *rv = val / 1000ULL;
                 *suffix = 'k';
         } else {
@@ -946 +946 @@
 }
 
-void bin_order_suffix(const uint64_t val, uint64_t *rv, const char **suffix,
-    bool fixed)
-{
-        if (val > UINT64_C(1152921504606846976)) {
-                *rv = val / UINT64_C(1125899906842624);
-                *suffix = "EiB";
-        } else if (val > UINT64_C(1125899906842624)) {
-                *rv = val / UINT64_C(1099511627776);
-                *suffix = "TiB";
-        } else if (val > UINT64_C(1099511627776)) {
-                *rv = val / UINT64_C(1073741824);
-                *suffix = "GiB";
-        } else if (val > UINT64_C(1073741824)) {
-                *rv = val / UINT64_C(1048576);
-                *suffix = "MiB";
-        } else if (val > UINT64_C(1048576)) {
-                *rv = val / UINT64_C(1024);
-                *suffix = "KiB";
-        } else {
-                *rv = val;
-                if (fixed)
-                        *suffix = "B  ";
-                else
-                        *suffix = "B";
-        }
-}
-
 /** @}
  */