projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Did some more work on bug 12859 and then realized that a *good*
[pspp]
/
src
/
dictionary.h
diff --git
a/src/dictionary.h
b/src/dictionary.h
index e5badf2731d7c2dcb3a40250b24452f17c5bfe81..06e190a3db1ab7d3f88074bd75132ba887820f3f 100644
(file)
--- 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
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#ifndef DICTIONARY_H
#define DICTIONARY_H
#ifndef DICTIONARY_H
#define DICTIONARY_H
@@
-40,15
+40,12
@@
void dict_get_vars (const struct dictionary *,
struct variable *dict_create_var (struct dictionary *, const char *,
int width);
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 *,
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 *,
struct variable *dict_lookup_var (const struct dictionary *, const char *);
struct variable *dict_lookup_var_assert (const struct dictionary *,
@@
-57,8
+54,11
@@
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_var (struct dictionary *, struct variable *);
void dict_delete_vars (struct dictionary *,
struct variable *const *, size_t count);
+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_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);
int dict_rename_vars (struct dictionary *,
struct variable **, char **new_names,
size_t count, char **err_name);
@@
-105,12
+105,6
@@
const struct vector *dict_lookup_vector (const struct dictionary *,
const char *name);
void dict_clear_vectors (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 */
#endif /* dictionary.h */