Simplify a bit of code using snprintf().

[pspp] / src / language / stats / flip.c

diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c
index bc5399a7b3ca500165f1f2585693a21175cbba5c..95a5f6d1594d8e8a2fa7e530c076da3653dee99e 100644 (file)
--- a/src/language/stats/flip.c
+++ b/src/language/stats/flip.c
@@ -18,27 +18,27 @@
    02110-1301, USA. */
 
 #include "config.h"
-#include "message.h"
+#include <libpspp/message.h>
 #include <ctype.h>
 #include <errno.h>
 #include <float.h>
 #include <limits.h>
 #include <stdlib.h>
-#include "array.h"
-#include "alloc.h"
-#include "case.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
+#include <libpspp/array.h>
+#include <libpspp/alloc.h>
+#include <data/case.h>
+#include <language/command.h>
+#include <data/dictionary.h>
+#include <libpspp/message.h>
 #include "intprops.h"
-#include "lexer.h"
-#include "misc.h"
-#include "pool.h"
-#include "settings.h"
-#include "str.h"
-#include "value.h"
-#include "variable.h"
-#include "procedure.h"
+#include <language/lexer/lexer.h>
+#include <libpspp/misc.h>
+#include <libpspp/pool.h>
+#include <data/settings.h>
+#include <libpspp/str.h>
+#include <data/value.h>
+#include <data/variable.h>
+#include <procedure.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -91,7 +91,7 @@ cmd_flip (void)
 
   if (temporary != 0)
     {
-      msg (SM, _("FLIP ignores TEMPORARY.  "
+      msg (SW, _("FLIP ignores TEMPORARY.  "
                  "Temporary transformations will be made permanent."));
       cancel_temporary (); 
     }
@@ -331,12 +331,8 @@ flip_sink_write (struct case_sink *sink, const struct ccase *c)
             strcpy (v->name, "VNEGINF");
           else if (f > INT_MAX)
             strcpy (v->name, "VPOSINF");
-          else 
-            {
-              char name[INT_STRLEN_BOUND (int) + 2];
-              sprintf (name, "V%d", (int) f);
-              str_copy_trunc (v->name, sizeof v->name, name);
-            }
+          else
+            snprintf (v->name, sizeof v->name, "V%d", (int) f);
         }
       else
        {