Update all #include directives to the currently preferred style.

[pspp-builds.git] / src / libpspp / argv-parser.c

diff --git a/src/libpspp/argv-parser.c b/src/libpspp/argv-parser.c
index b3dc46134a81653a9698269a7da8b0ceec033058..c72c250394864091bb8bcd3458cb8bfae413c2c1 100644 (file)
--- a/src/libpspp/argv-parser.c
+++ b/src/libpspp/argv-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <libpspp/argv-parser.h>
+#include "libpspp/argv-parser.h"
 
 #include <limits.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct argv_option_plus
   {
@@ -78,6 +78,7 @@ argv_parser_add_options (struct argv_parser *ap,
         ap->options = x2nrealloc (ap->options, &ap->allocated_options,
                                   sizeof *ap->options);
 
+      assert (src->long_name != NULL || src->short_name != 0);
       dst = &ap->options[ap->n_options++];
       dst->base = *src;
       dst->cb = cb;
@@ -127,11 +128,11 @@ argv_parser_run (struct argv_parser *ap, int argc, char **argv)
           if (shortopt_ptrs[c] == NULL)
             {
               shortopt_ptrs[c] = aop;
-              ds_put_char (&shortopts, aop->base.short_name);
+              ds_put_byte (&shortopts, aop->base.short_name);
               if (aop->base.has_arg != no_argument)
-                ds_put_char (&shortopts, ':');
+                ds_put_byte (&shortopts, ':');
               if (aop->base.has_arg == optional_argument)
-                ds_put_char (&shortopts, ':');
+                ds_put_byte (&shortopts, ':');
             }
           else
             {