Changeset 86 for trunk/src/os2ahci/libc.c

Timestamp:

Apr 28, 2011, 7:41:44 PM (14 years ago)

Author:

chris

Message:

• Cosmetic changes to comments
• Fix number to string conversion for negative [decimal] numbers (the minus sign was at the wrong location and the two's complement was not respected). This functionality was unused so far but popped up during a code review.

File:

• trunk/src/os2ahci/libc.c (modified) (4 diffs)

trunk/src/os2ahci/libc.c

@@ -715 +715 @@
 static void long_to_asc(long val, char _far *buf, int base, int zero, int flen)
 {
-  register unsigned long abs_val = (unsigned long) val;
+  register unsigned long abs_val;
   char tmp[80];
   char _far *ptmp = tmp;
@@ -725 +725 @@
   }
 
+  abs_val = (unsigned long) ((val < 0 && base <= 10) ? -val : val);
   tmp[sizeof(tmp) - 1] = '\0';
+
   for (s = ptmp + sizeof(tmp) - 2; s > ptmp; s--) {
     *s = hex_digits[abs_val % base];
@@ -734 +736 @@
   }
 
+  /* left-pad the resulting number with zeros or spaces up to 'flen' */
+  while (flen > 0) {
+    *(--s) = (zero) ? '0' : ' ';
+    flen--;
+  }
+
   /* prepend minus sign if val was negative and base is decimal or less */
   if (val < 0 && base <= 0) {
@@ -740 +748 @@
   }
 
-  /* left-pad the resulting number with zeros or spaces up to 'flen' */
-  while (flen > 0) {
-    *(--s) = (zero) ? '0' : ' ';
-    flen--;
-  }
-
   strcpy(buf, s);
 }