X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.h;h=a3005cf14d2575cfe6fea8b57e281a003f455f0e;hb=65e61cc92b48297625bc71cf31b8a19e301eb6c1;hp=0f5bb26dbc1c1d5dc55901f4d4b67691fea7fb89;hpb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;p=pspp

diff --git a/src/data/variable.h b/src/data/variable.h
index 0f5bb26dbc..a3005cf14d 100644
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -87,8 +87,8 @@ struct variable
 /* Variable names. */
 bool var_is_valid_name (const char *, bool issue_error);
 bool var_is_plausible_name (const char *name, bool issue_error);
-int compare_var_names (const void *, const void *, void *);
-unsigned hash_var_name (const void *, void *);
+int  compare_var_names (const void *, const void *, const void *);
+unsigned hash_var_name (const void *, const void *);
 
 /* Short names. */
 void var_set_short_name (struct variable *, const char *);
@@ -96,8 +96,8 @@ void var_set_short_name_suffix (struct variable *, const char *, int suffix);
 void var_clear_short_name (struct variable *);
 
 /* Pointers to `struct variable', by name. */
-int compare_var_ptr_names (const void *, const void *, void *);
-unsigned hash_var_ptr_name (const void *, void *);
+int compare_var_ptr_names (const void *, const void *, const void *);
+unsigned hash_var_ptr_name (const void *, const void *);
 
 /* Variable auxiliary data. */
 void *var_attach_aux (struct variable *,
@@ -125,54 +125,6 @@ struct vector
     struct variable **var;	/* Vector of variables. */
     int cnt;			/* Number of variables. */
   };
-
-/* PROCESS IF expression. */
-extern struct expression *process_if_expr;
-
-struct ccase;
-void dump_split_vars (const struct ccase *);
-
-struct var_set;
-
-struct dictionary;
-struct var_set *var_set_create_from_dict (const struct dictionary *d);
-struct var_set *var_set_create_from_array (struct variable *const *var,
-                                           size_t);
-
-size_t var_set_get_cnt (const struct var_set *vs);
-struct variable *var_set_get_var (const struct var_set *vs, size_t idx);
-struct variable *var_set_lookup_var (const struct var_set *vs,
-                                     const char *name);
-bool var_set_lookup_var_idx (const struct var_set *vs, const char *name,
-                             size_t *idx);
-void var_set_destroy (struct var_set *vs);
-
-/* Variable parsers. */
-
-enum
-  {
-    PV_NONE = 0,		/* No options. */
-    PV_SINGLE = 0001,		/* Restrict to a single name or TO use. */
-    PV_DUPLICATE = 0002,	/* Don't merge duplicates. */
-    PV_APPEND = 0004,		/* Append to existing list. */
-    PV_NO_DUPLICATE = 0010,	/* Error on duplicates. */
-    PV_NUMERIC = 0020,		/* Vars must be numeric. */
-    PV_STRING = 0040,		/* Vars must be string. */
-    PV_SAME_TYPE = 00100,	/* All vars must be the same type. */
-    PV_NO_SCRATCH = 00200 	/* Disallow scratch variables. */
-  };
-
-struct pool;
-struct variable *parse_variable (void);
-struct variable *parse_dict_variable (const struct dictionary *);
-int parse_variables (const struct dictionary *, struct variable ***, size_t *,
-                     int opts);
-int parse_var_set_vars (const struct var_set *, struct variable ***, size_t *,
-                        int opts);
-int parse_DATA_LIST_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars (char ***names, size_t *cnt, int opts);
-int parse_mixed_vars_pool (struct pool *,
-                           char ***names, size_t *cnt, int opts);
 
 
 /* Return a string representing this variable, in the form most 
@@ -182,15 +134,6 @@ int parse_mixed_vars_pool (struct pool *,
 const char * var_to_string(const struct variable *var);
 
 
-/* Two complementary functions for dealing with 
-   Very Long String variables */
-
-void copy_demangle (char *dst, size_t dst_size,
-		    const char *src, size_t src_size);
-
-void copy_mangle (char *dst, size_t dst_size,
-		  const char *src, size_t src_size);
-
 int width_to_bytes(int width);