projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* sys-file-info.c: (cmd_display) Use compare_var_ptr_names to
[pspp]
/
src
/
language
/
dictionary
/
modify-variables.c
diff --git
a/src/language/dictionary/modify-variables.c
b/src/language/dictionary/modify-variables.c
index 3bbf844f565ef465acada22596541f1fd6c21eed..f46dca7d73a6f1aba923e5ed3316de5eeeed0c43 100644
(file)
--- a/
src/language/dictionary/modify-variables.c
+++ b/
src/language/dictionary/modify-variables.c
@@
-54,7
+54,7
@@
struct ordering
static struct ordering forward_positional_ordering = {1, 1};
static int compare_variables_given_ordering (const void *, const void *,
static struct ordering forward_positional_ordering = {1, 1};
static int compare_variables_given_ordering (const void *, const void *,
- void *ordering);
+
const
void *ordering);
/* Explains how to modify the variables in a dictionary. */
struct var_modification
/* Explains how to modify the variables in a dictionary. */
struct var_modification
@@
-78,7
+78,7
@@
static bool rearrange_dict (struct dictionary *d,
/* Performs MODIFY VARS command. */
int
/* Performs MODIFY VARS command. */
int
-cmd_modify_vars (
void
)
+cmd_modify_vars (
struct dataset *ds
)
{
/* Bits indicated whether we've already encountered a subcommand of
this type. */
{
/* Bits indicated whether we've already encountered a subcommand of
this type. */
@@
-92,7
+92,7
@@
cmd_modify_vars (void)
size_t i;
size_t i;
- if (proc_make_temporary_transformations_permanent (
current_dataset
))
+ if (proc_make_temporary_transformations_permanent (
ds
))
msg (SE, _("MODIFY VARS may not be used after TEMPORARY. "
"Temporary transformations will be made permanent."));
msg (SE, _("MODIFY VARS may not be used after TEMPORARY. "
"Temporary transformations will be made permanent."));
@@
-142,7
+142,7
@@
cmd_modify_vars (void)
"of variables."));
goto done;
}
"of variables."));
goto done;
}
- dict_get_vars (dataset_dict (
current_dataset
), &v, &nv, 1u << DC_SYSTEM);
+ dict_get_vars (dataset_dict (
ds
), &v, &nv, 1u << DC_SYSTEM);
}
else
{
}
else
{
@@
-152,7
+152,7
@@
cmd_modify_vars (void)
free (v);
goto done;
}
free (v);
goto done;
}
- if (!parse_variables (dataset_dict (
current_dataset
), &v, &nv,
+ if (!parse_variables (dataset_dict (
ds
), &v, &nv,
PV_APPEND | PV_NO_DUPLICATE))
{
free (v);
PV_APPEND | PV_NO_DUPLICATE))
{
free (v);
@@
-194,7
+194,7
@@
cmd_modify_vars (void)
msg (SE, _("`(' expected on RENAME subcommand."));
goto done;
}
msg (SE, _("`(' expected on RENAME subcommand."));
goto done;
}
- if (!parse_variables (dataset_dict (
current_dataset
), &vm.rename_vars, &vm.rename_cnt,
+ if (!parse_variables (dataset_dict (
ds
), &vm.rename_vars, &vm.rename_cnt,
PV_APPEND | PV_NO_DUPLICATE))
goto done;
if (!lex_match ('='))
PV_APPEND | PV_NO_DUPLICATE))
goto done;
if (!lex_match ('='))
@@
-239,7
+239,7
@@
cmd_modify_vars (void)
already_encountered |= 4;
lex_match ('=');
already_encountered |= 4;
lex_match ('=');
- if (!parse_variables (dataset_dict (
current_dataset
), &keep_vars, &keep_cnt, PV_NONE))
+ if (!parse_variables (dataset_dict (
ds
), &keep_vars, &keep_cnt, PV_NONE))
goto done;
/* Transform the list of variables to keep into a list of
goto done;
/* Transform the list of variables to keep into a list of
@@
-248,7
+248,7
@@
cmd_modify_vars (void)
sort (keep_vars, keep_cnt, sizeof *keep_vars,
compare_variables_given_ordering, &forward_positional_ordering);
sort (keep_vars, keep_cnt, sizeof *keep_vars,
compare_variables_given_ordering, &forward_positional_ordering);
- dict_get_vars (dataset_dict (
current_dataset
), &all_vars, &all_cnt, 0);
+ dict_get_vars (dataset_dict (
ds
), &all_vars, &all_cnt, 0);
assert (all_cnt >= keep_cnt);
drop_cnt = all_cnt - keep_cnt;
assert (all_cnt >= keep_cnt);
drop_cnt = all_cnt - keep_cnt;
@@
-283,14
+283,14
@@
cmd_modify_vars (void)
already_encountered |= 4;
lex_match ('=');
already_encountered |= 4;
lex_match ('=');
- if (!parse_variables (dataset_dict (
current_dataset
), &drop_vars, &drop_cnt, PV_NONE))
+ if (!parse_variables (dataset_dict (
ds
), &drop_vars, &drop_cnt, PV_NONE))
goto done;
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
else if (lex_match_id ("MAP"))
{
goto done;
vm.drop_vars = drop_vars;
vm.drop_cnt = drop_cnt;
}
else if (lex_match_id ("MAP"))
{
- struct dictionary *temp = dict_clone (dataset_dict (
current_dataset
));
+ struct dictionary *temp = dict_clone (dataset_dict (
ds
));
int success = rearrange_dict (temp, &vm);
if (success)
{
int success = rearrange_dict (temp, &vm);
if (success)
{
@@
-320,11
+320,11
@@
cmd_modify_vars (void)
if (already_encountered & (1 | 4))
{
/* Read the data. */
if (already_encountered & (1 | 4))
{
/* Read the data. */
- if (!procedure (
current_dataset
,NULL, NULL))
+ if (!procedure (
ds
,NULL, NULL))
goto done;
}
goto done;
}
- if (!rearrange_dict (dataset_dict (
current_dataset
), &vm))
+ if (!rearrange_dict (dataset_dict (
ds
), &vm))
goto done;
ret_code = CMD_SUCCESS;
goto done;
ret_code = CMD_SUCCESS;
@@
-343,7
+343,7
@@
done:
ORDERING, returning a strcmp()-type result. */
static int
compare_variables_given_ordering (const void *a_, const void *b_,
ORDERING, returning a strcmp()-type result. */
static int
compare_variables_given_ordering (const void *a_, const void *b_,
- void *ordering_)
+
const
void *ordering_)
{
struct variable *const *pa = a_;
struct variable *const *pb = b_;
{
struct variable *const *pa = a_;
struct variable *const *pb = b_;
@@
-372,7
+372,7
@@
struct var_renaming
var_renaming structures A and B. */
static int
compare_var_renaming_by_new_name (const void *a_, const void *b_,
var_renaming structures A and B. */
static int
compare_var_renaming_by_new_name (const void *a_, const void *b_,
-
void *foo
UNUSED)
+
const void *aux
UNUSED)
{
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
{
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;