Changeset 1531

Timestamp:

Sep 28, 2004, 5:24:16 AM (21 years ago)

Author:

bird

Message:

New size prefixes.

File:

• trunk/src/emx/src/lib/io/_output.c (modified) (13 diffs, 1 prop)

trunk/src/emx/src/lib/io/_output.c

@@ -17 +17 @@
 #define FALSE           0
 #define TRUE            1
+
+#define SIZE_HH         (('h' << 8) | 'h')
+#define SIZE_LL         (('l' << 8) | 'l')
 
 #define DEFAULT_PREC    6
@@ -695 +698 @@
 {
   olocal v;
-  char size, cont;
+  int size;
+  char cont;
   unsigned char c;
   int mbn, shift;
@@ -818 +822 @@
         /* Size */
 
-        if (*format == 'h' || *format == 'l' || *format == 'L')
+        if (   *format == 'h' || *format == 'l' || *format == 'L'
+            || *format == 'j' || *format == 'z' || *format == 't'
+            || *format == 'q' || *format == 'Z' )
           {
             size = *format++;
             if (size == 'l' && *format == 'l')
               {
-                size = 'L'; ++format;
-              }
+                size = SIZE_LL; ++format;
+              }
+            else if (size == 'h' && *format == 'h')
+              {
+                size = SIZE_HH; ++format;
+              }
+            else if (size == 'q' || size == 'j')
+                size = SIZE_LL;
+            else if (size == 'z' || size == 'Z' || size == 't')
+                size = 'l';
           }
 
@@ -835 +849 @@
 
           case 'n':
-            if (size == 'L')
+            if (size == SIZE_LL || size == 'L')
               {
                 long long *ptr = va_arg (arg_ptr, long long *);
@@ -843 +857 @@
               {
                 short *ptr = va_arg (arg_ptr, short *);
+                *ptr = v.count;
+              }
+            else if (size == SIZE_HH)
+              {
+                char *ptr = va_arg (arg_ptr, char *);
                 *ptr = v.count;
               }
@@ -868 +887 @@
           case 'd':
           case 'i':
-            if (size == 'L')
+            if (size == SIZE_LL || size == 'L')
               {
                 long long n = va_arg (arg_ptr, long long);
@@ -881 +900 @@
                 if (size == 'h')
                   n = (short)n;
+                else if (size == SIZE_HH)
+                  n = (char)n;
                 if (n < 0)
                   CHECK (cvt_dec_32 (&v, -n, TRUE, TRUE));
@@ -889 +910 @@
 
           case 'u':
-            if (size == 'L')
+            if (size == SIZE_LL || size == 'L')
               CHECK (cvt_dec_64 (&v, va_arg (arg_ptr, unsigned long long),
                                  FALSE, FALSE));
@@ -897 +918 @@
                 if (size == 'h')
                   n = (unsigned short)n;
+                else if (size == SIZE_HH)
+                  n = (unsigned char)n;
                 CHECK (cvt_dec_32 (&v, n, FALSE, FALSE));
               }
@@ -908 +931 @@
           case 'x':
           case 'X':
-            if (size == 'L')
+            if (size == SIZE_LL || size == 'L')
               CHECK (cvt_hex_64 (&v, va_arg (arg_ptr, unsigned long long),
                                  *format));
@@ -916 +939 @@
                 if (size == 'h')
                   n = (unsigned short)n;
+                else if (size == SIZE_HH)
+                  n = (unsigned char)n;
                 CHECK (cvt_hex_32 (&v, n, *format));
               }
@@ -921 +946 @@
 
           case 'o':
-            if (size == 'L')
+            if (size == SIZE_LL || size == 'L')
               CHECK (cvt_oct_64 (&v, va_arg (arg_ptr, unsigned long long)));
             else
@@ -928 +953 @@
                 if (size == 'h')
                   n = (unsigned short)n;
+                else if (size == SIZE_HH)
+                  n = (unsigned char)n;
                 CHECK (cvt_oct_32 (&v, n));
               }