i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some style cleanups.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4457 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-09-02 23:54:14 +00:00
parent c188392c20
commit c3b3abea79
1 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/libroot/posix/stdio/kvsprintf.c
+50 -33
View File
@@ -63,7 +63,9 @@ static int skip_atoi(const char **s)
#define SPECIAL 32 /* 0x */ #define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ #define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
static unsigned long long do_div(unsigned long long *n, unsigned base)
static unsigned long long
do_div(unsigned long long *n, unsigned base)
{ {
unsigned long long res; unsigned long long res;
res = (*n) % (unsigned long long)base; res = (*n) % (unsigned long long)base;
@@ -73,11 +75,12 @@ static unsigned long long do_div(unsigned long long *n, unsigned base)
return res; return res;
} }
static char * number(char * str, long long num, unsigned base, int size, int precision
,int type) static char *
number(char *str, long long num, unsigned base, int size, int precision, int type)
{ {
char c,sign,tmp[66];
const char *digits="0123456789abcdefghijklmnopqrstuvwxyz"; const char *digits="0123456789abcdefghijklmnopqrstuvwxyz";
char c, sign, tmp[66];
int i; int i;
if (type & LARGE) if (type & LARGE)
@@ -86,6 +89,7 @@ static char * number(char * str, long long num, unsigned base, int size, int pre
type &= ~ZEROPAD; type &= ~ZEROPAD;
if (base < 2 || base > 36) if (base < 2 || base > 36)
return 0; return 0;
c = (type & ZEROPAD) ? '0' : ' '; c = (type & ZEROPAD) ? '0' : ' ';
sign = 0; sign = 0;
if (type & SIGN) { if (type & SIGN) {
@@ -109,25 +113,30 @@ static char * number(char * str, long long num, unsigned base, int size, int pre
} }
i = 0; i = 0;
if (num == 0) if (num == 0)
tmp[i++]='0'; tmp[i++] = '0';
else while (num != 0) else while (num != 0)
tmp[i++] = digits[do_div(&num,base)]; tmp[i++] = digits[do_div(&num, base)];
if (i > precision) if (i > precision)
precision = i; precision = i;
size -= precision; size -= precision;
if (!(type&(ZEROPAD+LEFT)))
while(size-->0) if (!(type&(ZEROPAD + LEFT))) {
while (size-- > 0)
*str++ = ' '; *str++ = ' ';
}
if (sign) if (sign)
*str++ = sign; *str++ = sign;
if (type & SPECIAL) { if (type & SPECIAL) {
if (base==8) if (base == 8)
*str++ = '0'; *str++ = '0';
else if (base==16) { else if (base == 16) {
*str++ = '0'; *str++ = '0';
*str++ = digits[33]; *str++ = digits[33];
} }
} }
if (!(type & LEFT)) if (!(type & LEFT))
while (size-- > 0) while (size-- > 0)
*str++ = c; *str++ = c;
@@ -137,44 +146,46 @@ static char * number(char * str, long long num, unsigned base, int size, int pre
*str++ = tmp[i]; *str++ = tmp[i];
while (size-- > 0) while (size-- > 0)
*str++ = ' '; *str++ = ' ';
return str; return str;
} }
/* Forward decl. needed for IP address printing stuff... */
int sprintf(char * buf, const char *fmt, ...);
int vsprintf(char *buf, const char *fmt, va_list args) /* Forward decl. needed for IP address printing stuff... */
int sprintf(char *buf, const char *fmt, ...);
int
vsprintf(char *buf, const char *fmt, va_list args)
{ {
int len; int len;
unsigned long long num; unsigned long long num;
int i, base; int i, base;
char * str; char * str;
const char *s; const char *s;
int flags; /* flags to number() */
int flags; /* flags to number() */
int field_width; /* width of output field */ int field_width; /* width of output field */
int precision; /* min. # of digits for integers; max int precision;
number of chars for from string */ /* min. # of digits for integers; max number of chars for from string */
int qualifier; /* 'h', 'l', or 'L' for integer fields */ int qualifier; /* 'h', 'l', or 'L' for integer fields */
for (str=buf ; *fmt ; ++fmt) { for (str = buf; *fmt; ++fmt) {
if (*fmt != '%') { if (*fmt != '%') {
*str++ = *fmt; *str++ = *fmt;
continue; continue;
} }
/* process flags */ /* process flags */
flags = 0; flags = 0;
repeat: repeat:
++fmt; /* this also skips first '%' */ ++fmt; /* this also skips first '%' */
switch (*fmt) { switch (*fmt) {
case '-': flags |= LEFT; goto repeat; case '-': flags |= LEFT; goto repeat;
case '+': flags |= PLUS; goto repeat; case '+': flags |= PLUS; goto repeat;
case ' ': flags |= SPACE; goto repeat; case ' ': flags |= SPACE; goto repeat;
case '#': flags |= SPECIAL; goto repeat; case '#': flags |= SPECIAL; goto repeat;
case '0': flags |= ZEROPAD; goto repeat; case '0': flags |= ZEROPAD; goto repeat;
} }
/* get field width */ /* get field width */
field_width = -1; field_width = -1;
@@ -290,6 +301,7 @@ int vsprintf(char *buf, const char *fmt, va_list args)
--fmt; --fmt;
continue; continue;
} }
if (qualifier == 'L') if (qualifier == 'L')
num = va_arg(args, unsigned long long); num = va_arg(args, unsigned long long);
else if (qualifier == 'l') { else if (qualifier == 'l') {
@@ -304,20 +316,25 @@ int vsprintf(char *buf, const char *fmt, va_list args)
num = va_arg(args, int); num = va_arg(args, int);
else else
num = va_arg(args, unsigned int); num = va_arg(args, unsigned int);
str = number(str, num, base, field_width, precision, flags); str = number(str, num, base, field_width, precision, flags);
} }
*str = '\0'; *str = '\0';
return str-buf; return str - buf;
} }
int sprintf(char * buf, const char *fmt, ...)
int
sprintf(char *buffer, const char *format, ...)
{ {
va_list args; va_list args;
int i; int i;
va_start(args, fmt); va_start(args, format);
i=vsprintf(buf,fmt,args); i = vsprintf(buffer, format, args);
va_end(args); va_end(args);
return i; return i;
} }