cast: New macro NULL_SENTINEL.

[pspp] / src / ui / terminal / terminal-opts.c

diff --git a/src/ui/terminal/terminal-opts.c b/src/ui/terminal/terminal-opts.c
index 306ebe1523d5b674e729f44ae8a51acd50eb9b8a..d885cd0ef627a0b400c0c911d671a8d8f440dcad 100644 (file)
--- a/src/ui/terminal/terminal-opts.c
+++ b/src/ui/terminal/terminal-opts.c
@@ -28,6 +28,7 @@
 #include "language/syntax-file.h"
 #include "libpspp/argv-parser.h"
 #include "libpspp/assertion.h"
+#include "libpspp/cast.h"
 #include "libpspp/compiler.h"
 #include "libpspp/getl.h"
 #include "libpspp/llx.h"
@@ -185,7 +186,7 @@ usage (void)
   char *supported_formats = get_supported_formats ();
   char *default_include_path = get_default_include_path ();
 
-  printf ("\
+  printf (_("\
 PSPP, a program for statistical analysis of sample data.\n\
 Usage: %s [OPTION]... FILE...\n\
 \n\
@@ -217,7 +218,7 @@ Informative output:\n\
   -h, --help                display this help and exit\n\
   -V, --version             output version information and exit\n\
 \n\
-Non-option arguments are interpreted as syntax files to execute.\n",
+Non-option arguments are interpreted as syntax files to execute.\n"),
           program_name, supported_formats, default_include_path);
 
   free (supported_formats);
@@ -273,7 +274,7 @@ terminal_option_callback (int id, void *to_)
     case OPT_VERSION:
       version_etc (stdout, "pspp", PACKAGE_NAME, PACKAGE_VERSION,
                    "Ben Pfaff", "John Darrington", "Jason Stover",
-                   (char *) NULL);
+                   NULL_SENTINEL);
       exit (EXIT_SUCCESS);
 
     default:
@@ -286,7 +287,7 @@ terminal_opts_init (struct argv_parser *ap, struct source_stream *ss)
 {
   struct terminal_opts *to;
 
-  to = xmalloc (sizeof *to);
+  to = xzalloc (sizeof *to);
   to->source_stream = ss;
   to->syntax_mode = GETL_BATCH;
   string_map_init (&to->options);