JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* smallprint.c (rnarg): New macro.

Browse Source 
(rnargLL): Ditto.
(__rn): Rename from 'rn', add a mask argument, and use the mask argument to
control how many significant digits to care about.
(__small_vsprintf): Use __rn, rnarg, rnargLL, as appropriate.
This commit is contained in:
Christopher Faylor 2005-01-31 19:52:03 +00:00
parent ad1d82b851
commit 01d13d44fb
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2005-01-31 Christopher Faylor <cgf@timesys.com>
* smallprint.c (rnarg): New macro.
(rnargLL): Ditto.
(__rn): Rename from 'rn', add a mask argument, and use the mask
argument to control how many significant digits to care about.
(__small_vsprintf): Use __rn, rnarg, rnargLL, as appropriate.
2005-01-31 Christopher Faylor <cgf@timesys.com> 2005-01-31 Christopher Faylor <cgf@timesys.com>
* pinfo.cc (pinfo::exit): Only return low-order 16 bits when exiting. * pinfo.cc (pinfo::exit): Only return low-order 16 bits when exiting.

34
winsup/cygwin/smallprint.c
View File

@ -18,11 +18,17 @@ details. */
int __small_sprintf (char *dst, const char *fmt, ...); int __small_sprintf (char *dst, const char *fmt, ...);
int __small_vsprintf (char *dst, const char *fmt, va_list ap); int __small_vsprintf (char *dst, const char *fmt, va_list ap);
#define LLMASK (0xffffffffffffffffULL)
#define LMASK (0xffffffff)
#define rnarg(dst, base, dosign, len, pad) __rn ((dst), (base), (dosign), va_arg (ap, unsigned), len, pad, LMASK)
#define rnargLL(dst, base, dosign, len, pad) __rn ((dst), (base), (dosign), va_arg (ap, unsigned long long), len, pad, LLMASK)
static char * static char *
rn (char *dst, int base, int dosign, long long val, int len, int pad) __rn (char *dst, int base, int dosign, long long val, int len, int pad, unsigned long long mask)
{ {
/* longest number is ULLONG_MAX, 18446744073709551615, 20 digits */ /* longest number is ULLONG_MAX, 18446744073709551615, 20 digits */
unsigned long long uval; unsigned long long uval = 0;
char res[20]; char res[20];
static const char str[16] = "0123456789ABCDEF"; static const char str[16] = "0123456789ABCDEF";
int l = 0; int l = 0;
@ -38,9 +44,9 @@ rn (char *dst, int base, int dosign, long long val, int len, int pad)
uval = val; uval = val;
} }
else else
{ uval = val;
uval = val;
} uval &= mask;
do do
{ {
@ -115,38 +121,38 @@ __small_vsprintf (char *dst, const char *fmt, va_list ap)
{ {
*dst++ = '0'; *dst++ = '0';
*dst++ = 'x'; *dst++ = 'x';
dst = rn (dst, 16, 0, c, len, pad); dst = __rn (dst, 16, 0, c, len, pad, LMASK);
} }
} }
break; break;
case 'E': case 'E':
strcpy (dst, "Win32 error "); strcpy (dst, "Win32 error ");
dst = rn (dst + sizeof ("Win32 error"), 10, 0, GetLastError (), len, pad); dst = __rn (dst + sizeof ("Win32 error"), 10, 0, GetLastError (), len, pad, LMASK);
break; break;
case 'd': case 'd':
dst = rn (dst, 10, addsign, va_arg (ap, int), len, pad); dst = rnarg (dst, 10, addsign, len, pad);
break; break;
case 'D': case 'D':
dst = rn (dst, 10, addsign, va_arg (ap, long long), len, pad); dst = rnargLL (dst, 10, addsign, len, pad);
break; break;
case 'u': case 'u':
dst = rn (dst, 10, 0, va_arg (ap, int), len, pad); dst = rnarg (dst, 10, 0, len, pad);
break; break;
case 'U': case 'U':
dst = rn (dst, 10, 0, va_arg (ap, long long), len, pad); dst = rnargLL (dst, 10, 0, len, pad);
break; break;
case 'o': case 'o':
dst = rn (dst, 8, 0, va_arg (ap, unsigned), len, pad); dst = rnarg (dst, 8, 0, len, pad);
break; break;
case 'p': case 'p':
*dst++ = '0'; *dst++ = '0';
*dst++ = 'x'; *dst++ = 'x';
/* fall through */ /* fall through */
case 'x': case 'x':
dst = rn (dst, 16, 0, va_arg (ap, int), len, pad); dst = rnarg (dst, 16, 0, len, pad);
break; break;
case 'X': case 'X':
dst = rn (dst, 16, 0, va_arg (ap, long long), len, pad); dst = rnargLL (dst, 16, 0, len, pad);
break; break;
case 'P': case 'P':
if (!GetModuleFileName (NULL, tmp, CYG_MAX_PATH)) if (!GetModuleFileName (NULL, tmp, CYG_MAX_PATH))