projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid unfounded warnings from GCC 7.2.
[pspp]
/
src
/
language
/
stats
/
aggregate.c
diff --git
a/src/language/stats/aggregate.c
b/src/language/stats/aggregate.c
index ff6c1fb59e8434a9ae475186a6d48d3e11369587..03117a5e6135ce4b30ac1eee01e0529654c450af 100644
(file)
--- a/
src/language/stats/aggregate.c
+++ b/
src/language/stats/aggregate.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011
, 2012, 2014
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
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
@@
-49,6
+49,7
@@
#include "math/sort.h"
#include "math/statistic.h"
#include "math/sort.h"
#include "math/statistic.h"
+#include "gl/c-strcase.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
#include "gl/minmax.h"
#include "gl/xalloc.h"
@@
-452,7
+453,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
exclude = ds_chomp_byte (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
exclude = ds_chomp_byte (&function_name, '.') ? MV_SYSTEM : MV_ANY;
for (function = agr_func_tab; function->name; function++)
- if (!strcasecmp (function->name, ds_cstr (&function_name)))
+ if (!
c_
strcasecmp (function->name, ds_cstr (&function_name)))
break;
if (NULL == function->name)
{
break;
if (NULL == function->name)
{
@@
-469,7
+470,6
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
{
if (function->src_vars == AGR_SV_YES)
{
{
if (function->src_vars == AGR_SV_YES)
{
- lex_force_match (lexer, T_LPAREN);
goto error;
}
}
goto error;
}
}
@@
-638,7
+638,7
@@
parse_aggregate_functions (struct lexer *lexer, const struct dictionary *dict,
free (dest[i]);
if (dest_label[i])
free (dest[i]);
if (dest_label[i])
- var_set_label (destvar, dest_label[i]
, true
);
+ var_set_label (destvar, dest_label[i]);
v->dest = destvar;
}
v->dest = destvar;
}