sys-file-reader: Better handle duplicate names without long names.

[pspp] / src / data / dictionary.h

diff --git a/src/data/dictionary.h b/src/data/dictionary.h
index fdc28611f69bf421f996eeb460bc2ae3377708d5..1166fcd280b04ec05dda3ac7dc7033d41133f666 100644 (file)
--- a/src/data/dictionary.h
+++ b/src/data/dictionary.h
@@ -82,6 +82,8 @@ void dict_reorder_vars (struct dictionary *,
                         struct variable *const *, size_t count);
 
 /* Variable names. */
+bool dict_try_rename_var (struct dictionary *,
+                          struct variable *, const char *);
 void dict_rename_var (struct dictionary *, struct variable *, const char *);
 bool dict_rename_vars (struct dictionary *,
                        struct variable **, char **new_names,
@@ -182,11 +184,9 @@ struct dict_callbacks
   void (*var_deleted) (struct dictionary *, const struct variable *,
                        int dict_index, int case_index, void *);
   void (*var_changed) (struct dictionary *, int, unsigned int, const struct variable *, void *);
-  void (*var_resized) (struct dictionary *, int, int, void *);
   void (*weight_changed) (struct dictionary *, int, void *);
   void (*filter_changed) (struct dictionary *, int, void *);
   void (*split_changed) (struct dictionary *, void *);
-  void (*var_display_width_changed) (struct dictionary *, int, void *);
  };
 
 void dict_set_callbacks (struct dictionary *, const struct dict_callbacks *,