struct data_in i;
+ char *s = NULL;
bool ok;
assert ((width != 0) == fmt_is_string (format));
else
{
const char *dest_encoding;
- char *s = NULL;
+
if ( dict == NULL)
{
assert (0 == (fmt_get_category (format) & (FMT_CAT_BINARY | FMT_CAT_STRING)));
dest_encoding = dict_get_encoding (dict);
s = recode_string (dest_encoding, i.src_enc, ss_data (input), ss_length (input));
- ss_alloc_uninit (&i.input, strlen (s));
- memcpy (ss_data (i.input), s, ss_length (input));
- free (s);
+ i.input = ss_cstr (s);
}
ok = handlers[i.format] (&i);
if (!ok)
default_result (&i);
+ free (s);
return ok;
}
ds_put_format (&text, _("%s field) "), fmt_name (i->format));
ds_put_vformat (&text, format, args);
- m.category = MSG_DATA;
- m.severity = MSG_WARNING;
+ m.category = MSG_C_DATA;
+ m.severity = MSG_S_WARNING;
m.text = ds_cstr (&text);
+ m.where.file_name = NULL;
+ m.where.line_number = -1;
msg_emit (&m);
}