projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Makefile.am: Add pspp-mode.el to EXTRA_DIST.
[pspp]
/
src
/
count.c
diff --git
a/src/count.c
b/src/count.c
index af9642b8a233d2cb65bb914737cd391a417089da..e3220d79485a5d94ea9c39f8c24374897c46fcd0 100644
(file)
--- a/
src/count.c
+++ b/
src/count.c
@@
-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. */
#include <config.h>
#include "error.h"
#include <config.h>
#include "error.h"
@@
-108,7
+108,7
@@
struct cnt_var_info
struct cnt_var_info *next;
struct variable *d; /* Destination variable. */
struct cnt_var_info *next;
struct variable *d; /* Destination variable. */
- char n[
9];
/* Name of dest var. */
+ char n[
LONG_NAME_LEN + 1];
/* Name of dest var. */
struct counting *c; /* The counting specifications. */
};
struct counting *c; /* The counting specifications. */
};
@@
-145,7
+145,7
@@
cmd_count (void)
cnt->d = NULL;
cnt->c = NULL;
cnt->d = NULL;
cnt->c = NULL;
- /* Get destination
struct
variable, or at least its name. */
+ /* Get destination variable, or at least its name. */
if (!lex_force_id ())
goto fail;
cnt->d = dict_lookup_var (default_dict, tokid);
if (!lex_force_id ())
goto fail;
cnt->d = dict_lookup_var (default_dict, tokid);
@@
-158,7
+158,7
@@
cmd_count (void)
}
}
else
}
}
else
- str
cpy (
cnt->n, tokid);
+ str
_copy_trunc (cnt->n, sizeof
cnt->n, tokid);
lex_get ();
if (!lex_force_match ('='))
lex_get ();
if (!lex_force_match ('='))
@@
-349,7
+349,7
@@
parse_string_criteria (struct counting * c)
cur = &c->crit.s[n++];
cur->type = CNT_SINGLE;
cur->s = malloc (len + 1);
cur = &c->crit.s[n++];
cur->type = CNT_SINGLE;
cur->s = malloc (len + 1);
- st
_pad_copy (cur->s, ds_c_str (&tokstr), len + 1
);
+ st
r_copy_rpad (cur->s, len + 1, ds_c_str (&tokstr)
);
lex_get ();
lex_match (',');
lex_get ();
lex_match (',');