X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Ftext-data-import-dialog.c;h=4baa99e014b169426e69fd978850bf27e9b9992e;hb=a5097a183f00ab2d2dc538ba7094a4696e2fea04;hp=dac8b4c1e0a5c0ad8cb22ef0887b85375eefe94b;hpb=04d2c99833753252b724dd9d4f15cc3a80b6bec8;p=pspp-builds.git diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c index dac8b4c1..4baa99e0 100644 --- a/src/ui/gui/text-data-import-dialog.c +++ b/src/ui/gui/text-data-import-dialog.c @@ -1748,7 +1748,9 @@ parse_field (struct import_assistant *ia, if (field.string != NULL) { msg_disable (); + /* FIXME: NULL should be replaced with the destination dictionary */ if (!data_in (field, LEGACY_NATIVE, in->type, 0, 0, 0, + NULL, &val, var_get_width (var))) { char fmt_string[FMT_STRING_LEN_MAX + 1]; @@ -1768,10 +1770,7 @@ parse_field (struct import_assistant *ia, } if (outputp != NULL) { - char *output = xmalloc (out.w + 1); - data_out (&val, &out, output); - output[out.w] = '\0'; - *outputp = output; + *outputp = data_out (&val, dict_get_encoding (ia->formats.dict), &out); } value_destroy (&val, var_get_width (var));