Changeset 684 for trunk/libs/mini-libc/stdio.c

Timestamp:

Jan 13, 2021, 12:40:22 AM (3 years ago)

Author:

alain

Message:

Introduce the socket.c & socket.h files.

File:

• trunk/libs/mini-libc/stdio.c (modified) (4 diffs)

trunk/libs/mini-libc/stdio.c

@@ -142 +142 @@
             }
             case ('x'):             // up to 8 digits hexa after "0x"
-            case ('X'):             // exactly 8 digits hexa after "0x"
             {
                 unsigned int val = va_arg( *args , unsigned int );
@@ -150 +149 @@
                 {
                     buf[7 - i] = HexaTab[val & 0xF];
-                    if( (*format == 'x') && ((val >> 4) == 0) )  break;
                     val = val >> 4;
+                    if( val == 0)  break;
                 }
                 len =  i + 1;
@@ -157 +156 @@
                 break;
             }
+            case ('X'):             // exactly 8 digits hexa after "0x"
+            {
+                unsigned int val = va_arg( *args , unsigned int );
+                TO_STREAM( '0' );
+                TO_STREAM( 'x' );
+                for(i = 0 ; i < 8 ; i++) 
+                {
+                    buf[7 - i] = (val != 0) ? HexaTab[val & 0xF] : '0';
+                    val = val >> 4;
+                }
+                len = 8;
+                pbuf = &buf[0];
+                break;
+            }
             case ('l'):             // up to 16 digits hexa after "0x"
-            case ('L'):             // exactly 16 digits hexa after "0x"
             {
                 unsigned long long val = ((unsigned long long)va_arg( *args, unsigned int)) |
@@ -167 +179 @@
                 {
                     buf[15 - i] = HexaTab[val & 0xF];
-                    if( (*format == 'l') && ((val >> 4) == 0) )  break;
                     val = val >> 4;
+                    if( val == 0)  break;
                 }
                 len =  i + 1;
                 pbuf = &buf[15 - i];
+                break;
+            }
+            case ('L'):             // exactly 16 digits hexa after "0x"
+            {
+                unsigned long long val = ((unsigned long long)va_arg( *args, unsigned int)) |
+                                         ((unsigned long long)va_arg( *args, unsigned int) << 32);
+                TO_STREAM( '0' );
+                TO_STREAM( 'x' );
+                for(i = 0 ; i < 16 ; i++) 
+                {
+                    buf[15 - i] = (val != 0) ? HexaTab[val & 0xF] : '0';
+                    val = val >> 4;
+                }
+                len =  16;
+                pbuf = &buf[0];
                 break;
             }