Fixed make distcheck

[pspp] / src / data / variable.c

diff --git a/src/data/variable.c b/src/data/variable.c
index 3c170c842c943fddd2039d8932543fb1849eebee..ca302415d22799c4a8547dd398ad601802b3fea3 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include "variable.h"
+#include <libpspp/assertion.h>
 #include <libpspp/message.h>
 #include <stdlib.h>
 #include <libpspp/alloc.h>
@@ -30,6 +31,8 @@
 #include <libpspp/str.h>
 #include "value-labels.h"
 
+#include "minmax.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
@@ -105,7 +108,7 @@ compare_values (const union value *a, const union value *b, int width)
   if (width == 0) 
     return a->f < b->f ? -1 : a->f > b->f;
   else
-    return memcmp (a->s, b->s, min(MAX_SHORT_STRING, width));
+    return memcmp (a->s, b->s, MIN(MAX_SHORT_STRING, width));
 }
 
 /* Create a hash of v */
@@ -117,7 +120,7 @@ hash_value(const union value  *v, int width)
   if ( 0 == width ) 
     id_hash = hsh_hash_double (v->f);
   else
-    id_hash = hsh_hash_bytes (v->s, min(MAX_SHORT_STRING, width));
+    id_hash = hsh_hash_bytes (v->s, MIN(MAX_SHORT_STRING, width));
 
   return id_hash;
 }
@@ -131,6 +134,7 @@ hash_value(const union value  *v, int width)
 bool
 var_is_valid_name (const char *name, bool issue_error) 
 {
+  bool plausible;
   size_t length, i;
   
   assert (name != NULL);
@@ -139,7 +143,7 @@ var_is_valid_name (const char *name, bool issue_error)
      CHARACTERS */
   length = strlen (name);
 
-  bool plausible = var_is_plausible_name(name, issue_error);
+  plausible = var_is_plausible_name(name, issue_error);
 
   if ( ! plausible ) 
     return false;
@@ -214,7 +218,7 @@ var_is_plausible_name (const char *name, bool issue_error)
 /* A hsh_compare_func that orders variables A and B by their
    names. */
 int
-compare_var_names (const void *a_, const void *b_, void *foo UNUSED) 
+compare_var_names (const void *a_, const void *b_, const void *aux UNUSED) 
 {
   const struct variable *a = a_;
   const struct variable *b = b_;
@@ -224,7 +228,7 @@ compare_var_names (const void *a_, const void *b_, void *foo UNUSED)
 
 /* A hsh_hash_func that hashes variable V based on its name. */
 unsigned
-hash_var_name (const void *v_, void *foo UNUSED) 
+hash_var_name (const void *v_, const void *aux UNUSED) 
 {
   const struct variable *v = v_;
 
@@ -234,7 +238,7 @@ hash_var_name (const void *v_, void *foo UNUSED)
 /* A hsh_compare_func that orders pointers to variables A and B
    by their names. */
 int
-compare_var_ptr_names (const void *a_, const void *b_, void *foo UNUSED) 
+compare_var_ptr_names (const void *a_, const void *b_, const void *aux UNUSED) 
 {
   struct variable *const *a = a_;
   struct variable *const *b = b_;
@@ -245,7 +249,7 @@ compare_var_ptr_names (const void *a_, const void *b_, void *foo UNUSED)
 /* A hsh_hash_func that hashes pointer to variable V based on its
    name. */
 unsigned
-hash_var_ptr_name (const void *v_, void *foo UNUSED) 
+hash_var_ptr_name (const void *v_, const void *aux UNUSED) 
 {
   struct variable *const *v = v_;
 
@@ -345,7 +349,28 @@ dict_class_to_name (enum dict_class dict_class)
     case DC_SCRATCH:
       return _("scratch");
     default:
-      assert (0);
-      abort ();
+      NOT_REACHED ();
+    }
+}
+
+/* Return the number of bytes used when writing case_data for a variable 
+   of WIDTH */
+int
+width_to_bytes(int width)
+{
+  assert (width >= 0);
+
+  if ( width == 0 ) 
+    return MAX_SHORT_STRING ;
+  else if (width <= MAX_LONG_STRING) 
+    return ROUND_UP (width, MAX_SHORT_STRING);
+  else 
+    {
+      int chunks = width / EFFECTIVE_LONG_STRING_LENGTH ;
+      int remainder = width % EFFECTIVE_LONG_STRING_LENGTH ;
+      int bytes = remainder + (chunks * (MAX_LONG_STRING + 1) );
+      return ROUND_UP (bytes, MAX_SHORT_STRING); 
     }
 }
+
+