Changeset 1113c9e in mainline for uspace/app/sbi/src/bigint.c

Timestamp:

2010-06-09T19:03:24Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8eec3c8

Parents:

8f80c77 (diff), c5cb943d (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 from lp:~jsvoboda/helenos/sysel.

File:

• uspace/app/sbi/src/bigint.c (modified) (3 diffs)

uspace/app/sbi/src/bigint.c

@@ -360 +360 @@
 }
 
-/** Print bigint to standard output. */
-void bigint_print(bigint_t *bigint)
-{
+/** Convert bigint to string.
+ *
+ * @param bigint        Bigint to convert.
+ * @param dptr          Place to store pointer to new string.
+ */
+void bigint_get_as_string(bigint_t *bigint, char **dptr)
+{
+        static const char digits[] = { '0', '1', '2', '3', '4', '5', '6',
+            '7', '8', '9' };
+
         bigint_t val, tmp;
         bigint_word_t rem;
-        size_t ndigits;
-        int *digits;
-        size_t idx;
-
-#ifdef DEBUG_BIGINT_TRACE
-        printf("Print bigint.\n");
+        size_t nchars;
+        char *str;
+        size_t idx;
+
+#ifdef DEBUG_BIGINT_TRACE
+        printf("Convert bigint to string.\n");
 #endif
         assert(BIGINT_BASE >= 10);
 
-        if (bigint_is_zero(bigint)) {
-                putchar('0');
-                return;
-        }
-
-        if (bigint->negative)
-                putchar('-');
-
-        /* Compute number of digits. */
-        ndigits = 0;
+        /* Compute number of characters. */
+        nchars = 0;
+
+        if (bigint_is_zero(bigint) || bigint->negative)
+                nchars += 1; /* '0' or '-' */
+
         bigint_clone(bigint, &val);
         while (bigint_is_zero(&val) != b_true) {
@@ -390 +393 @@
                 bigint_shallow_copy(&tmp, &val);
 
-                ndigits += 1;
+                nchars += 1;
         }
         bigint_destroy(&val);
 
-        /* Store digits to array. */
-
-        digits = malloc(ndigits * sizeof(int));
-        if (digits == NULL) {
+        /* Store characters to array. */
+
+        str = malloc(nchars * sizeof(char) + 1);
+        if (str == NULL) {
                 printf("Memory allocation failed.\n");
                 exit(1);
         }
 
-        idx = 0;
+        if (bigint_is_zero(bigint)) {
+                str[0] = '0';
+        } else if (bigint->negative) {
+                str[0] = '-';
+        }
+
+        idx = 1;
         bigint_clone(bigint, &val);
         while (bigint_is_zero(&val) != b_true) {
@@ -409 +418 @@
                 bigint_shallow_copy(&tmp, &val);
 
-                digits[idx++] = (int) rem;
-        }
+                str[nchars - idx] = digits[(int) rem];
+                ++idx;
+        }
+
         bigint_destroy(&val);
-
-        for (idx = 0; idx < ndigits; ++idx)
-                printf("%u", digits[ndigits - 1 - idx]);
-
-        free(digits);
+        str[nchars] = '\0';
+        *dptr = str;
+}
+
+/** Print bigint to standard output.
+ *
+ * @param bigint        Bigint to print.
+ */
+void bigint_print(bigint_t *bigint)
+{
+        char *str;
+
+#ifdef DEBUG_BIGINT_TRACE
+        printf("Print bigint.\n");
+#endif
+        bigint_get_as_string(bigint, &str);
+        printf("%s", str);
+        free(str);
 }