Apply patch #5225, assertions.

[pspp-builds.git] / src / data / format.c

diff --git a/src/data/format.c b/src/data/format.c
index d3899b43996642d06532e769b454383ccea1cd05..f4a61d34bc1efd0f18bcb89170740a44170892a9 100644 (file)
--- a/src/data/format.c
+++ b/src/data/format.c
@@ -20,12 +20,13 @@
 #include <config.h>
 #include "format.h"
 #include <ctype.h>
-#include "message.h"
+#include <libpspp/assertion.h>
+#include <libpspp/message.h>
 #include <stdlib.h>
-#include "compiler.h"
-#include "misc.h"
+#include <libpspp/compiler.h>
+#include <libpspp/misc.h>
 #include "identifier.h"
-#include "str.h"
+#include <libpspp/str.h>
 #include "variable.h"
 
 #include "gettext.h"
@@ -280,7 +281,7 @@ convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output)
     case FMT_CCC:
     case FMT_CCD:
     case FMT_CCE:
-      assert (0);
+      NOT_REACHED ();
     case FMT_Z:
     case FMT_A:
       /* nothing is necessary */
@@ -314,7 +315,7 @@ convert_fmt_ItoO (const struct fmt_spec *input, struct fmt_spec *output)
       /* nothing is necessary */
       break;
     default:
-      assert (0);
+      NOT_REACHED ();
     }
 
   assert (check_output_specifier (output, 0));
@@ -372,3 +373,19 @@ make_output_format (int type, int w, int d)
   assert (check_output_specifier (&f, 0));
   return f;
 }
+
+
+bool 
+measure_is_valid(enum measure m)
+{
+  if ( m <= 0 ) return false;
+  if ( m >= n_MEASURES) return false;
+  return true;
+}
+
+bool 
+alignment_is_valid(enum alignment a)
+{
+  if ( a >= n_ALIGN) return false;
+  return true;
+}