/[pspp]/pspp/src/rename-vars.c
ViewVC logotype

Diff of /pspp/src/rename-vars.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.9 by blp, Sun Jul 31 21:42:46 2005 UTC revision 1.10 by blp, Mon Oct 24 02:51:31 2005 UTC
# Line 39  cmd_rename_variables (void) Line 39  cmd_rename_variables (void)
39  {  {
40    struct variable **rename_vars = NULL;    struct variable **rename_vars = NULL;
41    char **rename_new_names = NULL;    char **rename_new_names = NULL;
42    int rename_cnt = 0;    size_t rename_cnt = 0;
43    char *err_name;    char *err_name;
44    
45    int status = CMD_FAILURE;    int status = CMD_FAILURE;
46    
   int i;  
   
47    if (temporary != 0)    if (temporary != 0)
48      {      {
49        msg (SE, _("RENAME VARS may not be used after TEMPORARY.  "        msg (SE, _("RENAME VARS may not be used after TEMPORARY.  "
# Line 55  cmd_rename_variables (void) Line 53  cmd_rename_variables (void)
53    
54    do    do
55      {      {
56        int prev_nv_1 = rename_cnt;        size_t prev_nv_1 = rename_cnt;
57        int prev_nv_2 = rename_cnt;        size_t prev_nv_2 = rename_cnt;
58    
59        if (!lex_match ('('))        if (!lex_match ('('))
60          {          {
# Line 75  cmd_rename_variables (void) Line 73  cmd_rename_variables (void)
73          goto lossage;          goto lossage;
74        if (prev_nv_1 != rename_cnt)        if (prev_nv_1 != rename_cnt)
75          {          {
76              size_t i;
77    
78            msg (SE, _("Differing number of variables in old name list "            msg (SE, _("Differing number of variables in old name list "
79                 "(%d) and in new name list (%d)."),                       "(%u) and in new name list (%u)."),
80                 rename_cnt - prev_nv_2, prev_nv_1 - prev_nv_2);                 (unsigned) rename_cnt - prev_nv_2,
81                   (unsigned) prev_nv_1 - prev_nv_2);
82            for (i = 0; i < prev_nv_1; i++)            for (i = 0; i < prev_nv_1; i++)
83              free (rename_new_names[i]);              free (rename_new_names[i]);
84            free (rename_new_names);            free (rename_new_names);
# Line 106  cmd_rename_variables (void) Line 107  cmd_rename_variables (void)
107    free (rename_vars);    free (rename_vars);
108    if (rename_new_names != NULL)    if (rename_new_names != NULL)
109      {      {
110          size_t i;
111        for (i = 0; i < rename_cnt; i++)        for (i = 0; i < rename_cnt; i++)
112          free (rename_new_names[i]);          free (rename_new_names[i]);
113        free (rename_new_names);        free (rename_new_names);

Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26