X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvector.c;h=fd65d284d43ea6d75d1db2885f1b9ad87d37bce9;hb=50ac6802fc247814dc4dd6232f6304b928a2d78b;hp=01309d848b2de3f1111b7feedf9e7b35a5ab0fda;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp-builds.git

diff --git a/src/data/vector.c b/src/data/vector.c
index 01309d84..fd65d284 100644
--- a/src/data/vector.c
+++ b/src/data/vector.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
    Copyright (C) 2006  Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 #include "vector.h"
@@ -29,7 +27,7 @@
 /* Vector of variables. */
 struct vector
   {
-    char name[LONG_NAME_LEN + 1];       /* Name. */
+    char name[VAR_NAME_LEN + 1];       /* Name. */
     struct variable **vars;             /* Set of variables. */
     size_t var_cnt;                     /* Number of variables. */
   };
@@ -37,11 +35,11 @@ struct vector
 /* Checks that all the variables in VECTOR have consistent
    width. */
 static void
-check_widths (const struct vector *vector) 
+check_widths (const struct vector *vector)
 {
   int width = var_get_width (vector->vars[0]);
   size_t i;
-  
+
   for (i = 1; i < vector->var_cnt; i++)
     assert (width == var_get_width (vector->vars[i]));
 }
@@ -51,7 +49,7 @@ check_widths (const struct vector *vector)
    All variables in VARS must have the same type and width. */
 struct vector *
 vector_create (const char *name,
-               struct variable **vars, size_t var_cnt) 
+               struct variable **vars, size_t var_cnt)
 {
   struct vector *vector = xmalloc (sizeof *vector);
 
@@ -68,35 +66,35 @@ vector_create (const char *name,
 
 /* Creates and returns a new vector as a clone of OLD, but that
    contains variables from NEW_DICT that are in the same position
-   as those in OLD are in OLD_DICT. 
+   as those in OLD are in OLD_DICT.
    All variables in the new vector must have the same type and
    width. */
 struct vector *
 vector_clone (const struct vector *old,
               const struct dictionary *old_dict,
-              const struct dictionary *new_dict) 
+              const struct dictionary *new_dict)
 {
   struct vector *new = xmalloc (sizeof *new);
   size_t i;
-  
+
   strcpy (new->name, old->name);
 
   new->vars = xnmalloc (old->var_cnt, sizeof *new->vars);
   new->var_cnt = old->var_cnt;
-  for (i = 0; i < new->var_cnt; i++) 
+  for (i = 0; i < new->var_cnt; i++)
     {
       assert (dict_contains_var (old_dict, old->vars[i]));
       new->vars[i] = dict_get_var (new_dict,
                                    var_get_dict_index (old->vars[i]));
     }
   check_widths (new);
-  
+
   return new;
 }
 
 /* Destroys VECTOR. */
 void
-vector_destroy (struct vector *vector) 
+vector_destroy (struct vector *vector)
 {
   free (vector->vars);
   free (vector);
@@ -104,20 +102,20 @@ vector_destroy (struct vector *vector)
 
 /* Returns VECTOR's name. */
 const char *
-vector_get_name (const struct vector *vector) 
+vector_get_name (const struct vector *vector)
 {
   return vector->name;
 }
 
 /* Returns the type of the variables in VECTOR. */
-enum var_type vector_get_type (const struct vector *vector) 
+enum val_type vector_get_type (const struct vector *vector)
 {
   return var_get_type (vector->vars[0]);
 }
 
 /* Returns the variable in VECTOR with the given INDEX. */
 struct variable *
-vector_get_var (const struct vector *vector, size_t index) 
+vector_get_var (const struct vector *vector, size_t index)
 {
   assert (index < vector->var_cnt);
   return vector->vars[index];
@@ -125,7 +123,7 @@ vector_get_var (const struct vector *vector, size_t index)
 
 /* Returns the number of variables in VECTOR. */
 size_t
-vector_get_var_cnt (const struct vector *vector) 
+vector_get_var_cnt (const struct vector *vector)
 {
   return vector->var_cnt;
 }
@@ -139,7 +137,7 @@ compare_vector_ptrs_by_name (const void *a_, const void *b_)
   struct vector *const *pb = b_;
   struct vector *a = *pa;
   struct vector *b = *pb;
-  
+
   return strcasecmp (a->name, b->name);
 }