projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change type of variables whose addresses are passed to dict_get_vars()
[pspp]
/
src
/
count.c
diff --git
a/src/count.c
b/src/count.c
index 82085d6fe0f6e476d74b9e2d653dfaca34e06ca4..90275084a6e5848f1ef01f31ea411a938168bb48 100644
(file)
--- a/
src/count.c
+++ b/
src/count.c
@@
-29,6
+29,9
@@
#include "str.h"
#include "var.h"
#include "str.h"
#include "var.h"
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
/* Implementation details:
The S?SS manuals do not specify the order that COUNT subcommands are
/* Implementation details:
The S?SS manuals do not specify the order that COUNT subcommands are
@@
-158,7
+161,7
@@
cmd_count (void)
}
}
else
}
}
else
- st
_trim_copy (cnt->n, tokid, sizeof cnt->n
);
+ st
r_copy_trunc (cnt->n, sizeof cnt->n, tokid
);
lex_get ();
if (!lex_force_match ('='))
lex_get ();
if (!lex_force_match ('='))
@@
-349,7
+352,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 (',');
@@
-382,7
+385,7
@@
count_numeric (struct counting * cnt, struct ccase * c)
counter++;
continue;
}
counter++;
continue;
}
- if (cnt->missing >= 2 &&
is_num_user_missing (cmp, cnt->v[i]
))
+ if (cnt->missing >= 2 &&
mv_is_num_user_missing (&cnt->v[i]->miss, cmp
))
{
counter++;
continue;
{
counter++;
continue;