X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fcategory.c;h=a8dd431b31904845b9efec054fbb4646af5e0190;hb=13a7d7fb2c398784b25f7f5f363c3fd86dc93eed;hp=d320cea2a108f955475b413fd0cabbe54173691a;hpb=338fb2a2e84df6427a2fdee6769421f57d5666d8;p=pspp-builds.git

diff --git a/src/data/category.c b/src/data/category.c
index d320cea2..a8dd431b 100644
--- a/src/data/category.c
+++ b/src/data/category.c
@@ -1,6 +1,5 @@
 /* PSPP - binary encodings for categorical variables.
    Copyright (C) 2005 Free Software Foundation, Inc.
-   Written by Jason H Stover <jason@sakla.net>.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -41,18 +40,36 @@
 
 #include <libpspp/alloc.h>
 #include <libpspp/message.h>
-#include "cat-routines.h"
+#include "category.h"
 #include "value.h"
 #include "variable.h"
 
+#define CAT_VALUE_NOT_FOUND -2
+
 #define N_INITIAL_CATEGORIES 1
 
+/*
+  This structure contains the observed values of a
+  categorical variable.
+ */
+struct cat_vals
+{
+  union value *vals;
+  size_t n_categories;
+  size_t n_allocated_categories;	/* This is used only during
+					   initialization to keep
+					   track of the number of
+					   values stored.
+					 */
+};
+
 void
-cat_stored_values_create (struct variable *v)
+cat_stored_values_create (const struct variable *v)
 {
   if (!var_has_obs_vals (v))
     {
       struct cat_vals *obs_vals = xmalloc (sizeof *obs_vals);
+
       obs_vals->n_categories = 0;
       obs_vals->n_allocated_categories = N_INITIAL_CATEGORIES;
       obs_vals->vals = xnmalloc (N_INITIAL_CATEGORIES, sizeof *obs_vals->vals);
@@ -63,7 +80,7 @@ cat_stored_values_create (struct variable *v)
 void
 cat_stored_values_destroy (struct cat_vals *obs_vals)
 {
-  if (obs_vals != NULL) 
+  if (obs_vals != NULL)
     {
       if (obs_vals->n_allocated_categories > 0)
         free (obs_vals->vals);
@@ -97,7 +114,7 @@ cat_value_find (const struct variable *v, const union value *val)
    Add the new value unless it is already present.
  */
 void
-cat_value_update (struct variable *v, const union value *val)
+cat_value_update (const struct variable *v, const union value *val)
 {
   if (var_is_alpha (v))
     {
@@ -117,8 +134,8 @@ cat_value_update (struct variable *v, const union value *val)
     }
 }
 
-union value *
-cat_subscript_to_value (const size_t s, struct variable *v)
+const union value *
+cat_subscript_to_value (const size_t s, const struct variable *v)
 {
   struct cat_vals *obs_vals = var_get_obs_vals (v);
   return s < obs_vals->n_categories ? obs_vals->vals + s : NULL;