projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(src_data_libdata_a_SOURCES): Add val-type.h, to fix make distcheck.
[pspp]
/
src
/
language
/
stats
/
frequencies.q
diff --git
a/src/language/stats/frequencies.q
b/src/language/stats/frequencies.q
index 93e16f7f2126bed8396fa45b6a043963734a6441..fdb19b0391f9c23dec4e036217e40b9bfa6af466 100644
(file)
--- a/
src/language/stats/frequencies.q
+++ b/
src/language/stats/frequencies.q
@@
-38,12
+38,10
@@
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <language/dictionary/split-file.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
#include <libpspp/array.h>
#include <libpspp/bit-vector.h>
#include <libpspp/compiler.h>
#include <libpspp/hash.h>
-#include <libpspp/magic.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
#include <libpspp/message.h>
#include <libpspp/misc.h>
#include <libpspp/pool.h>
@@
-60,6
+58,7
@@
#include "freq.h"
#include "minmax.h"
#include "freq.h"
#include "minmax.h"
+#include "xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-311,7
+310,7
@@
internal_cmd_frequencies (struct lexer *lexer, struct dataset *ds)
if (!parse_frequencies (lexer, ds, &cmd, NULL))
return CMD_FAILURE;
if (!parse_frequencies (lexer, ds, &cmd, NULL))
return CMD_FAILURE;
- if (cmd.onepage_limit ==
NOT_LONG
)
+ if (cmd.onepage_limit ==
LONG_MIN
)
cmd.onepage_limit = 50;
/* Figure out statistics to calculate. */
cmd.onepage_limit = 50;
/* Figure out statistics to calculate. */
@@
-637,12
+636,12
@@
postcalc (void)
}
/* Returns the comparison function that should be used for
}
/* Returns the comparison function that should be used for
- sorting a frequency table by FRQ_SORT using VA
R
_TYPE
- va
riabl
es. */
+ sorting a frequency table by FRQ_SORT using VA
L
_TYPE
+ va
lu
es. */
static hsh_compare_func *
static hsh_compare_func *
-get_freq_comparator (int frq_sort, enum va
r_type var
_type)
+get_freq_comparator (int frq_sort, enum va
l_type val
_type)
{
{
- bool is_numeric = va
r_type == VAR
_NUMERIC;
+ bool is_numeric = va
l_type == VAL
_NUMERIC;
switch (frq_sort)
{
case FRQ_AVALUE:
switch (frq_sort)
{
case FRQ_AVALUE: