generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't use 'register'

Browse Source 
make strtol() returns get stored in long variables
don't mix size_t with int
This commit is contained in:
Daniel Stenberg 2004-03-08 11:28:14 +00:00
parent a684c51c9b
commit d9ffd2f544
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/mprintf.c
View File

@ -152,7 +152,7 @@ struct asprintf {
int curl_msprintf(char *buffer, const char *format, ...); int curl_msprintf(char *buffer, const char *format, ...);
static int dprintf_DollarString(char *input, char **end) static long dprintf_DollarString(char *input, char **end)
{ {
int number=0; int number=0;
while(isdigit((int)*input)) { while(isdigit((int)*input)) {
@ -285,12 +285,12 @@ static int dprintf_Pass1(char *format, va_stack_t *vto, char **endpos, va_list a
{ {
char *fmt = format; char *fmt = format;
int param_num = 0; int param_num = 0;
int this_param; long this_param;
int width; long width;
int precision; long precision;
int flags; int flags;
int max_param=0; long max_param=0;
int i; long i;
while (*fmt) { while (*fmt) {
if (*fmt++ == '%') { if (*fmt++ == '%') {
@ -461,13 +461,21 @@ static int dprintf_Pass1(char *format, va_stack_t *vto, char **endpos, va_list a
case 'f': case 'f':
vto[i].type = FORMAT_DOUBLE; vto[i].type = FORMAT_DOUBLE;
break; break;
case 'e': case 'E': case 'e':
vto[i].type = FORMAT_DOUBLE; vto[i].type = FORMAT_DOUBLE;
flags |= FLAGS_FLOATE| (('E' == *fmt)?FLAGS_UPPER:0); flags |= FLAGS_FLOATE;
break; break;
case 'g': case 'G': case 'E':
vto[i].type = FORMAT_DOUBLE; vto[i].type = FORMAT_DOUBLE;
flags |= FLAGS_FLOATG| (('G' == *fmt)?FLAGS_UPPER:0); flags |= FLAGS_FLOATE|FLAGS_UPPER;
break;
case 'g':
vto[i].type = FORMAT_DOUBLE;
flags |= FLAGS_FLOATG;
break;
case 'G':
vto[i].type = FORMAT_DOUBLE;
flags |= FLAGS_FLOATG|FLAGS_UPPER;
break; break;
default: default:
vto[i].type = FORMAT_UNKNOWN; vto[i].type = FORMAT_UNKNOWN;
@ -580,7 +588,7 @@ static int dprintf_formatf(
char *f; char *f;
/* Number of characters written. */ /* Number of characters written. */
register size_t done = 0; int done = 0;
long param; /* current parameter to read */ long param; /* current parameter to read */
long param_num=0; /* parameter counter */ long param_num=0; /* parameter counter */
@ -734,7 +742,7 @@ static int dprintf_formatf(
/* Number of base BASE. */ /* Number of base BASE. */
{ {
char *workend = &work[sizeof(work) - 1]; char *workend = &work[sizeof(work) - 1];
register char *w; char *w;
/* Supply a default precision if none was given. */ /* Supply a default precision if none was given. */
if (prec == -1) if (prec == -1)
@ -863,7 +871,7 @@ static int dprintf_formatf(
else { else {
/* Write "(nil)" for a nil pointer. */ /* Write "(nil)" for a nil pointer. */
static char strnil[] = "(nil)"; static char strnil[] = "(nil)";
register char *point; char *point;
width -= sizeof(strnil) - 1; width -= sizeof(strnil) - 1;
if (p->flags & FLAGS_LEFT) if (p->flags & FLAGS_LEFT)