X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvector.h;h=b586421c8273c78f60be32a3fd32c6ce040a5713;hb=47af71b93ed4673d23594ed2b84743f15638f7b7;hp=0f4359826c5c3d22b331d0dbb0109d1fba4c3488;hpb=43b1296aafe7582e7dbe6c2b6a8b478d7d9b0fcf;p=pspp diff --git a/src/data/vector.h b/src/data/vector.h index 0f4359826c..b586421c82 100644 --- a/src/data/vector.h +++ b/src/data/vector.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2010, 2011 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 @@ -18,21 +18,23 @@ #define DATA_VECTOR_H 1 #include -#include +#include "data/variable.h" struct dictionary; struct vector *vector_create (const char *name, - struct variable **var, size_t var_cnt); + struct variable **var, size_t n_vars); struct vector *vector_clone (const struct vector *old, const struct dictionary *old_dict, const struct dictionary *new_dict); void vector_destroy (struct vector *); const char *vector_get_name (const struct vector *); -enum var_type vector_get_type (const struct vector *); +enum val_type vector_get_type (const struct vector *); struct variable *vector_get_var (const struct vector *, size_t idx); -size_t vector_get_var_cnt (const struct vector *); +size_t vector_get_n_vars (const struct vector *); + +bool vector_is_valid_name (const char *name, bool issue_error); int compare_vector_ptrs_by_name (const void *a_, const void *b_);