Changeset 364 for asp3_tinet_ecnl_rx/trunk/curl-7.57.0/lib/mprintf.c

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/curl-7.57.0/lib/mprintf.c (modified) (3 diffs)

asp3_tinet_ecnl_rx/trunk/curl-7.57.0/lib/mprintf.c

@@ -997 +997 @@
 {
         unsigned int r, i, j, w, f;
-        unsigned long v;
+        unsigned long long v;
         char s[16], c, d, *p;
 
@@ -1022 +1022 @@
                         w = w * 10 + c - '0';
                 if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
-                        f |= 4; c = *fmt++;
+                        c = *fmt++;
+                        if (c == 'l' || c == 'L') {     /* Prefix: Size is long int */
+                                f |= 32; c = *fmt++;
+                        }
+                        else {
+                                f |= 4;
+                        }
                 }
                 else if (c == 'h') {    /* Prefix: Size is short int */
@@ -1055 +1061 @@
 
                 /* Get an argument and put it in numeral */
-                v = (f & 4) ? va_arg(arp, long)
-                        : ((f & 16) ? ((d == 'D') ? (long)((short)va_arg(arp, int)) : (long)((unsigned short)va_arg(arp, unsigned int)))
-                                : ((d == 'D') ? (long)va_arg(arp, int) : (long)va_arg(arp, unsigned int)));
-                if (d == 'D' && (v & 0x80000000)) {
+                if (f & 4)
+                        v = (long long)va_arg(arp, long);
+                else if (f & 16)
+                        v = (d == 'D') ? (long long)((short)va_arg(arp, int)) : (long long)((unsigned short)va_arg(arp, unsigned int));
+                else if (f & 32)
+                        v = (d == 'D') ? (long long)(va_arg(arp, long long)) : (long long)(va_arg(arp, unsigned long long));
+                else
+                        v = (d == 'D') ? (long long)va_arg(arp, int) : (long long)va_arg(arp, unsigned int);
+                if (d == 'D' && (v & 0x8000000000000000ll)) {
                         v = 0 - v;
                         f |= 8;