Changeset 4fe3b6d in mainline for uspace/lib/c/generic/str.c

Timestamp:

2011-05-20T11:07:00Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8bb61e6

Parents:

3476be8 (diff), 7941bd6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with development

File:

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

uspace/lib/c/generic/str.c

@@ -1215 +1215 @@
 void order_suffix(const uint64_t val, uint64_t *rv, char *suffix)
 {
-        if (val > 10000000000000000000ULL) {
-                *rv = val / 1000000000000000000ULL;
+        if (val > UINT64_C(10000000000000000000)) {
+                *rv = val / UINT64_C(1000000000000000000);
                 *suffix = 'Z';
-        } else if (val > 1000000000000000000ULL) {
-                *rv = val / 1000000000000000ULL;
+        } else if (val > UINT64_C(1000000000000000000)) {
+                *rv = val / UINT64_C(1000000000000000);
                 *suffix = 'E';
-        } else if (val > 1000000000000000ULL) {
-                *rv = val / 1000000000000ULL;
+        } else if (val > UINT64_C(1000000000000000)) {
+                *rv = val / UINT64_C(1000000000000);
                 *suffix = 'T';
-        } else if (val > 1000000000000ULL) {
-                *rv = val / 1000000000ULL;
+        } else if (val > UINT64_C(1000000000000)) {
+                *rv = val / UINT64_C(1000000000);
                 *suffix = 'G';
-        } else if (val > 1000000000ULL) {
-                *rv = val / 1000000ULL;
+        } else if (val > UINT64_C(1000000000)) {
+                *rv = val / UINT64_C(1000000);
                 *suffix = 'M';
-        } else if (val > 1000000ULL) {
-                *rv = val / 1000ULL;
+        } else if (val > UINT64_C(1000000)) {
+                *rv = val / UINT64_C(1000);
                 *suffix = 'k';
         } else {
@@ -1239 +1239 @@
 }
 
+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";
+        }
+}
+
 /** @}
  */