switch(fmt) {
case SILC_PARAM_FUNC:
{
- SilcBufferFormatFunc func = NULL;
- SilcBufferSFormatFunc funcs = NULL;
+ SilcBufferFormatFunc func;
void *val;
void *context;
int tmp_len;
- if (!stack)
- func = va_arg(ap, SilcBufferFormatFunc);
- else
- funcs = va_arg(ap, SilcBufferSFormatFunc);
+ func = va_arg(ap, SilcBufferFormatFunc);
val = va_arg(ap, void *);
context = va_arg(ap, void *);
- if (!stack)
- tmp_len = func(dst, val, context);
- else
- tmp_len = funcs(stack, dst, val, context);
+ tmp_len = func(stack, dst, val, context);
if (tmp_len < 0)
goto fail;
if (tmp_len) {
case SILC_PARAM_UI16_STRING_ALLOC:
case SILC_PARAM_UI32_STRING_ALLOC:
{
- unsigned char *x = va_arg(ap, unsigned char *);
+ char *x = va_arg(ap, char *);
SilcUInt32 tmp_len = x ? strlen(x) : 0;
if (x && tmp_len) {
FORMAT_HAS_SPACE(stack, dst, tmp_len);
- silc_buffer_put(dst, x, tmp_len);
+ silc_buffer_put(dst, (unsigned char *)x, tmp_len);
silc_buffer_pull(dst, tmp_len);
}
break;
{
char x = (char)va_arg(ap, int);
FORMAT_HAS_SPACE(stack, dst, 1);
- silc_buffer_put(dst, &x, 1);
+ silc_buffer_put(dst, (unsigned char *)&x, 1);
silc_buffer_pull(dst, 1);
break;
}
switch(fmt) {
case SILC_PARAM_FUNC:
{
- SilcBufferUnformatFunc func = NULL;
- SilcBufferSUnformatFunc funcs = NULL;
+ SilcBufferUnformatFunc func;
void **val;
void *context;
int tmp_len;
- if (!stack)
- func = va_arg(ap, SilcBufferUnformatFunc);
- else
- funcs = va_arg(ap, SilcBufferSUnformatFunc);
+ func = va_arg(ap, SilcBufferUnformatFunc);
val = va_arg(ap, void **);
context = va_arg(ap, void *);
- if (!stack)
- tmp_len = func(src, val, context);
- else
- tmp_len = funcs(stack, src, val, context);
+ tmp_len = func(stack, src, val, context);
if (tmp_len < 0)
goto fail;
if (tmp_len) {