X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fmodify-variables.c;h=8de2ee18183161d824cf187743dbcf95276cdfb6;hb=d8ffe656444590f1199f62ac3ebdb9b7692923c2;hp=41709416ae669e349a6fa6263322cae3bed0d2d1;hpb=92c09e564002d356d20fc1e2e131027ef89f6748;p=pspp
diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index 41709416ae..8de2ee1818 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
@@ -26,17 +24,16 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
-#include
#include
#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -113,7 +110,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 1)
{
- msg (SE, _("REORDER subcommand may be given at most once."));
+ msg (SE, _("%s subcommand may be given at most once."), "REORDER");
goto done;
}
already_encountered |= 1;
@@ -140,13 +137,13 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
"of variables."));
goto done;
}
- dict_get_vars_mutable (dataset_dict (ds), &v, &nv, 1u << DC_SYSTEM);
+ dict_get_vars_mutable (dataset_dict (ds), &v, &nv, DC_SYSTEM);
}
else
{
if (!lex_match (lexer, '('))
{
- msg (SE, _("`(' expected on REORDER subcommand."));
+ msg (SE, _("`(' expected on %s subcommand."), "REORDER");
free (v);
goto done;
}
@@ -176,7 +173,7 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
if (already_encountered & 2)
{
- msg (SE, _("RENAME subcommand may be given at most once."));
+ msg (SE, _("%s subcommand may be given at most once."), "RENAME");
goto done;
}
already_encountered |= 2;
@@ -189,10 +186,10 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (!lex_match (lexer, '('))
{
- msg (SE, _("`(' expected on RENAME subcommand."));
+ msg (SE, _("`(' expected on %s subcommand."), "RENAME");
goto done;
}
- if (!parse_variables (lexer, dataset_dict (ds),
+ if (!parse_variables (lexer, dataset_dict (ds),
&vm.rename_vars, &vm.rename_cnt,
PV_APPEND | PV_NO_DUPLICATE))
goto done;
@@ -202,15 +199,14 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
"names on RENAME subcommand."));
goto done;
}
- if (!parse_DATA_LIST_vars (lexer, &vm.new_names,
+ if (!parse_DATA_LIST_vars (lexer, &vm.new_names,
&prev_nv_1, PV_APPEND))
goto done;
if (prev_nv_1 != vm.rename_cnt)
{
msg (SE, _("Differing number of variables in old name list "
- "(%d) and in new name list (%d)."),
- (int) (vm.rename_cnt - prev_nv_2),
- (int) (prev_nv_1 - prev_nv_2));
+ "(%zu) and in new name list (%zu)."),
+ vm.rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);
for (i = 0; i < prev_nv_1; i++)
free (vm.new_names[i]);
free (vm.new_names);
@@ -233,8 +229,8 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & 4)
{
- msg (SE, _("KEEP subcommand may be given at most once. It may not"
- "be given in conjunction with the DROP subcommand."));
+ msg (SE, _("KEEP subcommand may be given at most once. It may "
+ "not be given in conjunction with the DROP subcommand."));
goto done;
}
already_encountered |= 4;
@@ -293,9 +289,9 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
{
struct dictionary *temp = dict_clone (dataset_dict (ds));
int success = rearrange_dict (temp, &vm);
- if (success)
+ if (success)
{
- /* FIXME: display new dictionary. */
+ /* FIXME: display new dictionary. */
}
dict_destroy (temp);
}
@@ -321,12 +317,12 @@ cmd_modify_vars (struct lexer *lexer, struct dataset *ds)
if (already_encountered & (1 | 4))
{
/* Read the data. */
- if (!proc_execute (ds))
- goto done;
+ if (!proc_execute (ds))
+ goto done;
}
if (!rearrange_dict (dataset_dict (ds), &vm))
- goto done;
+ goto done;
ret_code = CMD_SUCCESS;
@@ -353,11 +349,11 @@ compare_variables_given_ordering (const void *a_, const void *b_,
const struct ordering *ordering = ordering_;
int result;
- if (ordering->positional)
+ if (ordering->positional)
{
size_t a_index = var_get_dict_index (a);
size_t b_index = var_get_dict_index (b);
- result = a_index < b_index ? -1 : a_index > b_index;
+ result = a_index < b_index ? -1 : a_index > b_index;
}
else
result = strcasecmp (var_get_name (a), var_get_name (b));
@@ -370,14 +366,14 @@ compare_variables_given_ordering (const void *a_, const void *b_,
struct var_renaming
{
struct variable *var;
- char new_name[LONG_NAME_LEN + 1];
+ char new_name[VAR_NAME_LEN + 1];
};
/* A algo_compare_func that compares new_name members in struct
var_renaming structures A and B. */
static int
compare_var_renaming_by_new_name (const void *a_, const void *b_,
- const void *aux UNUSED)
+ const void *aux UNUSED)
{
const struct var_renaming *a = a_;
const struct var_renaming *b = b_;
@@ -390,7 +386,7 @@ compare_var_renaming_by_new_name (const void *a_, const void *b_,
otherwise, and issues an error message. */
static int
validate_var_modification (const struct dictionary *d,
- const struct var_modification *vm)
+ const struct var_modification *vm)
{
/* Variable reordering can't be a problem, so we don't simulate
it. Variable renaming can cause duplicate names, but
@@ -430,14 +426,14 @@ validate_var_modification (const struct dictionary *d,
/* Copy variables into var_renaming array. */
var_renaming = xnmalloc (keep_cnt, sizeof *var_renaming);
- for (i = 0; i < keep_cnt; i++)
+ for (i = 0; i < keep_cnt; i++)
{
var_renaming[i].var = keep_vars[i];
strcpy (var_renaming[i].new_name, var_get_name (keep_vars[i]));
}
-
+
/* Rename variables in var_renaming array. */
- for (i = 0; i < vm->rename_cnt; i++)
+ for (i = 0; i < vm->rename_cnt; i++)
{
struct variable *const *kv;
struct var_renaming *vr;
@@ -511,7 +507,7 @@ rearrange_dict (struct dictionary *d, const struct var_modification *vm)
struct variable *var = dict_lookup_var (d, rename_old_names[i]);
if (var == NULL)
continue;
-
+
rename_vars[rename_cnt] = var;
rename_new_names[rename_cnt] = vm->new_names[i];
rename_cnt++;