X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.c;h=fc81c01e1499dd443795271c7ff13a40fdac9891;hb=a1a4228b112a6aca97fef5aaaf9ffa21271a1f72;hp=6c1414832b7c992fe5301940a80e33aca794b29d;hpb=573068f2bdcd3f8796e9646668fed910a90f890b;p=pspp-builds.git

diff --git a/src/data/variable.c b/src/data/variable.c
index 6c141483..fc81c01e 100644
--- 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>
@@ -215,7 +216,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_;
@@ -225,7 +226,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_;
 
@@ -235,7 +236,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_;
@@ -246,7 +247,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_;
 
@@ -346,7 +347,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); 
+    }
+}
+
+