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;
while(isdigit((int)*input)) {
{
char *fmt = format;
int param_num = 0;
- int this_param;
- int width;
- int precision;
+ long this_param;
+ long width;
+ long precision;
int flags;
- int max_param=0;
- int i;
+ long max_param=0;
+ long i;
while (*fmt) {
if (*fmt++ == '%') {
case 'f':
vto[i].type = FORMAT_DOUBLE;
break;
- case 'e': case 'E':
+ case 'e':
+ vto[i].type = FORMAT_DOUBLE;
+ flags |= FLAGS_FLOATE;
+ break;
+ case 'E':
vto[i].type = FORMAT_DOUBLE;
- flags |= FLAGS_FLOATE| (('E' == *fmt)?FLAGS_UPPER:0);
+ flags |= FLAGS_FLOATE|FLAGS_UPPER;
break;
- case 'g': case 'G':
+ case 'g':
+ vto[i].type = FORMAT_DOUBLE;
+ flags |= FLAGS_FLOATG;
+ break;
+ case 'G':
vto[i].type = FORMAT_DOUBLE;
- flags |= FLAGS_FLOATG| (('G' == *fmt)?FLAGS_UPPER:0);
+ flags |= FLAGS_FLOATG|FLAGS_UPPER;
break;
default:
vto[i].type = FORMAT_UNKNOWN;
char *f;
/* Number of characters written. */
- register size_t done = 0;
+ int done = 0;
long param; /* current parameter to read */
long param_num=0; /* parameter counter */
/* Number of base BASE. */
{
char *workend = &work[sizeof(work) - 1];
- register char *w;
+ char *w;
/* Supply a default precision if none was given. */
if (prec == -1)
else {
/* Write "(nil)" for a nil pointer. */
static char strnil[] = "(nil)";
- register char *point;
+ char *point;
width -= sizeof(strnil) - 1;
if (p->flags & FLAGS_LEFT)