X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fflip.c;h=b352f1b23301f4689e449fe61ed1cb9cde1c081e;hb=1f53043596e4f60c302974a83edbe2088fde4470;hp=c882f29a80ed8d6a81c91a034772c16a78a95eea;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git

diff --git a/src/flip.c b/src/flip.c
index c882f29a..b352f1b2 100644
--- a/src/flip.c
+++ b/src/flip.c
@@ -38,6 +38,9 @@
 #include "var.h"
 #include "vfm.h"
 
+#ifndef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 
 /* List of variable names. */
 struct varname
@@ -201,7 +204,7 @@ make_new_var (char name[])
           *cp = '_'; 
       }
   *cp = '\0';
-  st_uppercase (name);
+  str_uppercase (name);
   
   if (dict_create_var (default_dict, name, 0))
     return 1;
@@ -287,7 +290,8 @@ flip_sink_create (struct flip_pgm *flip)
 
   /* Write variable names as first case. */
   for (i = 0; i < flip->var_cnt; i++) 
-    st_bare_pad_copy (info->output_buf[i].s, flip->var[i]->name, MAX_SHORT_STRING);
+    buf_copy_str_rpad (info->output_buf[i].s, MAX_SHORT_STRING,
+                       flip->var[i]->name);
   if (fwrite (info->output_buf, sizeof *info->output_buf,
               flip->var_cnt, flip->file) != (size_t) flip->var_cnt)
     msg (FE, _("Error writing FLIP file: %s."), strerror (errno));
@@ -325,7 +329,7 @@ flip_sink_write (struct case_sink *sink, const struct ccase *c)
             {
               char name[INT_DIGITS + 2];
               sprintf (name, "V%d", (int) f);
-              st_trim_copy (v->name, name, sizeof v->name);
+              str_copy_trunc (v->name, sizeof v->name, name);
             }
         }
       else