X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Ffile-type.c;h=0774c68325543dc5fb6dfede5acccf1e8d7fd76b;hb=bbe7ad1a7454599693c188fe1eaf8f5d6e154206;hp=6a706eec5c2d5a01412d007773450796e858f459;hpb=119676ae19d4f862cab6261936d1f6223f5534cc;p=pspp diff --git a/src/file-type.c b/src/file-type.c index 6a706eec5c..0774c68325 100644 --- a/src/file-type.c +++ b/src/file-type.c @@ -33,6 +33,9 @@ #include "var.h" #include "vfm.h" +#include "gettext.h" +#define _(msgid) gettext (msgid) + /* Defines the three types of complex files read by FILE TYPE. */ enum { @@ -442,7 +445,7 @@ cmd_record_type (void) if (rct->nv >= mv) { mv += 16; - rct->v = xrealloc (rct->v, mv * sizeof *rct->v); + rct->v = xnrealloc (rct->v, mv, sizeof *rct->v); } if (formats[fty->record.fmt].cat & FCAT_STRING) @@ -450,8 +453,8 @@ cmd_record_type (void) if (!lex_force_string ()) goto error; rct->v[rct->nv].c = xmalloc (fty->record.nc + 1); - st_bare_pad_copy (rct->v[rct->nv].c, ds_c_str (&tokstr), - fty->record.nc + 1); + buf_copy_str_rpad (rct->v[rct->nv].c, fty->record.nc + 1, + ds_c_str (&tokstr)); } else {