Make the expression code a little nicer and fix bugs found

[pspp-builds.git] / src / html.c

diff --git a/src/html.c b/src/html.c
index 53add68cd5dacd51e2afd3d4ec23f0fb439571df..f0b4f5fdfb0f5698de0030bd30371b7e2715cfba 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -22,7 +22,7 @@
 
 #include <config.h>
 #include "htmlP.h"
-#include <assert.h>
+#include "error.h"
 #include <errno.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -46,13 +46,13 @@ static int postopen (struct file_ext *);
 static int preclose (struct file_ext *);
 
 static int
-html_open_global (struct outp_class *this unused)
+html_open_global (struct outp_class *this UNUSED)
 {
   return 1;
 }
 
 static int
-html_close_global (struct outp_class *this unused)
+html_close_global (struct outp_class *this UNUSED)
 {
   return 1;
 }
@@ -168,6 +168,7 @@ html_option (struct outp_driver *this, const char *key, const struct string *val
            break;
          default:
            assert (0);
+            abort ();
          }
        if (*dest)
          free (*dest);