X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdictionary.h;h=e527dd518fea9a528515aec339a93285f70444f6;hb=fa489d6ef77150e60c31906ee322bea2901da57f;hp=e5badf2731d7c2dcb3a40250b24452f17c5bfe81;hpb=05e356b2a3087e819ef3b5388e29c822f41502e1;p=pspp

diff --git a/src/dictionary.h b/src/dictionary.h
index e5badf2731..e527dd518f 100644
--- a/src/dictionary.h
+++ b/src/dictionary.h
@@ -14,8 +14,8 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #ifndef DICTIONARY_H
 #define DICTIONARY_H
@@ -34,21 +34,18 @@ void dict_destroy (struct dictionary *);
 size_t dict_get_var_cnt (const struct dictionary *);
 struct variable *dict_get_var (const struct dictionary *, size_t idx);
 void dict_get_vars (const struct dictionary *,
-                    struct variable ***vars, size_t *cnt,
+                    struct variable ***vars, int *cnt,
                     unsigned exclude_classes);
 
 struct variable *dict_create_var (struct dictionary *, const char *,
                                   int width);
 
-struct variable *dict_create_var_from_short (struct dictionary *d, 
-					     const char *shortname, 
-					     int width);
-
 struct variable *dict_create_var_assert (struct dictionary *, const char *,
                                   int width);
 struct variable *dict_clone_var (struct dictionary *, const struct variable *,
-                                 const char *shortname, const char *longname);
-void dict_rename_var (struct dictionary *, struct variable *, const char *);
+                                 const char *);
+struct variable *dict_clone_var_assert (struct dictionary *,
+                                        const struct variable *, const char *);
 
 struct variable *dict_lookup_var (const struct dictionary *, const char *);
 struct variable *dict_lookup_var_assert (const struct dictionary *,
@@ -57,8 +54,12 @@ int dict_contains_var (const struct dictionary *, const struct variable *);
 void dict_delete_var (struct dictionary *, struct variable *);
 void dict_delete_vars (struct dictionary *,
                        struct variable *const *, size_t count);
+void dict_delete_scratch_vars (struct dictionary *);
+void dict_reorder_var (struct dictionary *d, struct variable *v,
+                       size_t new_index);
 void dict_reorder_vars (struct dictionary *,
                         struct variable *const *, size_t count);
+void dict_rename_var (struct dictionary *, struct variable *, const char *);
 int dict_rename_vars (struct dictionary *,
                       struct variable **, char **new_names,
                       size_t count, char **err_name);
@@ -105,12 +106,6 @@ const struct vector *dict_lookup_vector (const struct dictionary *,
                                          const char *name);
 void dict_clear_vectors (struct dictionary *);
 
-void dict_get_varname_block(const struct dictionary *dict, char **buf, int *size);
-
-void dict_add_longvar_entry(struct dictionary *d, const char *name, 
-			    const char *longname);
-
-
-
+void dict_assign_short_names (struct dictionary *);
 
 #endif /* dictionary.h */