X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fvariable.h;h=1fefe1ee8d028aacc2be3db633f5c1f6d0b842c8;hb=fb224459eed00514cbc36ecbc311c644f8b22def;hp=e8f5f101469c1514587b0f24d9b053df5919f3fa;hpb=79100bdd30230890345c1c5a09ae57a19c1e408b;p=pspp

diff --git a/src/data/variable.h b/src/data/variable.h
index e8f5f10146..1fefe1ee8d 100644
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011, 2012, 2013, 2014 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
@@ -94,10 +94,6 @@ struct string;
 void var_append_value_name (const struct variable *, const union value *,
 			    struct string *);
 
-const char *
-var_get_value_name (const struct variable *v, const union value *value);
-
-
 bool var_has_value_labels (const struct variable *);
 const struct val_labs *var_get_value_labels (const struct variable *);
 void var_set_value_labels (struct variable *, const struct val_labs *);
@@ -120,7 +116,7 @@ struct fmt_spec var_default_formats (int width);
 /* Variable labels. */
 const char *var_to_string (const struct variable *);
 const char *var_get_label (const struct variable *);
-bool var_set_label (struct variable *, const char *label, bool issue_warning);
+void var_set_label (struct variable *, const char *label);
 void var_clear_label (struct variable *);
 bool var_has_label (const struct variable *);
 
@@ -145,10 +141,10 @@ enum measure var_default_measure (enum val_type);
 /* Intended usage of a variable, for populating dialogs. */
 enum var_role
   {
-    ROLE_NONE,
     ROLE_INPUT,
-    ROLE_OUTPUT,
+    ROLE_TARGET,
     ROLE_BOTH,
+    ROLE_NONE,
     ROLE_PARTITION,
     ROLE_SPLIT
   };
@@ -210,4 +206,7 @@ const char *var_get_encoding (const struct variable *);
 /* Function types. */
 typedef bool var_predicate_func (const struct variable *);
 
+double var_force_valid_weight (const struct variable *wv, double w,
+			       bool *warn_on_invalid);
+
 #endif /* data/variable.h */