arg = va_arg(vp, long);
/* Format the argument */
- sprintf(tmp, "%ld", arg);
+ sprintf(tmp, aux, arg);
}
else
{
arg = va_arg(vp, int);
/* Format the argument */
- sprintf(tmp, "%d", arg);
+ sprintf(tmp, aux, arg);
}
/* Done */
/* Access next argument */
arg = va_arg(vp, unsigned long);
- /* Format the argument */
- switch (aux[q-1])
- {
- case 'u':
- sprintf(tmp, "%lu", arg);
- break;
- case 'o':
- sprintf(tmp, "%lo", arg);
- break;
- case 'x':
- sprintf(tmp, "%lx", arg);
- break;
- case 'X':
- sprintf(tmp, "%lX", arg);
- break;
- default:
- sprintf(tmp, "");
- break;
- }
-
+ sprintf(tmp, aux, arg);
}
else
{
/* Access next argument */
arg = va_arg(vp, unsigned int);
+ sprintf(tmp, aux, arg);
- /* Format the argument */
- switch (aux[q - 1])
- {
- case 'u':
- sprintf(tmp, "%u", arg);
- break;
- case 'o':
- sprintf(tmp, "%o", arg);
- break;
- case 'x':
- sprintf(tmp, "%x", arg);
- break;
- case 'X':
- sprintf(tmp, "%X", arg);
- break;
- default:
- sprintf(tmp, "");
- break;
- }
}
/* Done */
arg = va_arg(vp, double);
/* Format the argument */
- switch (aux[q - 1])
- {
- case 'f':
- sprintf(tmp, "%f", arg);
- break;
- case 'e':
- sprintf(tmp, "%e", arg);
- break;
- case 'E':
- sprintf(tmp, "%E", arg);
- break;
- case 'g':
- sprintf(tmp, "%g", arg);
- break;
- case 'G':
- sprintf(tmp, "%G", arg);
- break;
- default:
- sprintf(tmp, aux, arg);
- break;
- }
+ sprintf(tmp, aux, arg);
/* Done */
break;
arg = va_arg(vp, vptr);
/* Format the argument */
- sprintf(tmp, "%p", arg);
+ sprintf(tmp, aux, arg);
/* Done */
break;
arg2[1023] = '\0';
/* Format the argument */
- sprintf(tmp, "%s", arg2);
+ sprintf(tmp, aux, arg);
/* Done */
break;
arg = va_arg(vp, vptr);
/* Format the "user data" */
- (void)vstrnfmt_aux(tmp, 1000, aux[q-1] == 'V' ? "%V" : "%v", arg);
+ sprintf(tmp, aux, arg);
/* Done */
break;