Parameter estimate matched with appropriate variable during estimation

[pspp] / src / file-type.c

diff --git a/src/file-type.c b/src/file-type.c
index 6a706eec5c2d5a01412d007773450796e858f459..0774c68325543dc5fb6dfede5acccf1e8d7fd76b 100644 (file)
--- 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
            {