posix-xprintf-functions.patch from patch #6230.

[pspp-builds.git] / src / language / data-io / file-handle.q

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index f1c7cb54afd868875c921b4f7769b9305a37ec67..71cc961f7227d4e1646a59d098fff9c4a87162d0 100644 (file)
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -19,17 +19,17 @@
 #include <libpspp/message.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <data/file-name.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/assertion.h>
 #include <libpspp/message.h>
-#include <libpspp/magic.h>
 #include <libpspp/str.h>
 #include <data/variable.h>
 #include <data/file-handle-def.h>
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -93,15 +93,15 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
       break;
     case FH_IMAGE:
       properties.mode = FH_MODE_BINARY;
-      if (cmd.n_lrecl[0] == NOT_LONG)
+      if (cmd.n_lrecl[0] == LONG_MIN)
         msg (SE, _("Fixed-length records were specified on /RECFORM, but "
                    "record length was not specified on /LRECL.  "
-                   "Assuming %u-character records."),
-             (unsigned int) properties.record_width);
+                   "Assuming %zu-character records."),
+             properties.record_width);
       else if (cmd.n_lrecl[0] < 1)
         msg (SE, _("Record length (%ld) must be at least one byte.  "
-                   "Assuming %u-character records."),
-             cmd.n_lrecl[0], (unsigned int) properties.record_width);
+                   "Assuming %zu-character records."),
+             cmd.n_lrecl[0], properties.record_width);
       else
         properties.record_width = cmd.n_lrecl[0];
       break;