projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added files in src/math
[pspp]
/
src
/
var-display.c
diff --git
a/src/var-display.c
b/src/var-display.c
index 47147dfb0fba0de4ad7e371c5294273610db5e90..485fd3a1197f73938f531bee53eb53b065194254 100644
(file)
--- a/
src/var-display.c
+++ b/
src/var-display.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 <stdio.h>
#include <config.h>
#include <stdio.h>
@@
-39,9
+39,9
@@
cmd_variable_alignment (void)
do
{
struct variable **v;
do
{
struct variable **v;
-
in
t nv;
+
size_
t nv;
-
in
t i;
+
size_
t i;
enum alignment align;
enum alignment align;
@@
-56,11
+56,19
@@
cmd_variable_alignment (void)
align = ALIGN_RIGHT;
else if ( lex_match_id("CENTER"))
align = ALIGN_CENTRE;
align = ALIGN_RIGHT;
else if ( lex_match_id("CENTER"))
align = ALIGN_CENTRE;
- else
- return CMD_FAILURE;
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
lex_force_match(')');
}
lex_force_match(')');
}
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
for( i = 0 ; i < nv ; ++i )
v[i]->alignment = align;
for( i = 0 ; i < nv ; ++i )
v[i]->alignment = align;
@@
-85,8
+93,8
@@
cmd_variable_width (void)
do
{
struct variable **v;
do
{
struct variable **v;
-
in
t nv;
-
in
t i;
+
size_
t nv;
+
size_
t i;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
@@
-119,9
+127,9
@@
cmd_variable_level (void)
do
{
struct variable **v;
do
{
struct variable **v;
-
in
t nv;
+
size_
t nv;
enum measure level;
enum measure level;
-
in
t i;
+
size_
t i;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
if (!parse_variables (default_dict, &v, &nv, PV_NONE))
return CMD_PART_SUCCESS_MAYBE;
@@
-134,12
+142,20
@@
cmd_variable_level (void)
level = MEASURE_ORDINAL;
else if ( lex_match_id("NOMINAL"))
level = MEASURE_NOMINAL;
level = MEASURE_ORDINAL;
else if ( lex_match_id("NOMINAL"))
level = MEASURE_NOMINAL;
- else
- return CMD_FAILURE;
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
lex_force_match(')');
}
lex_force_match(')');
}
-
+ else
+ {
+ free (v);
+ return CMD_FAILURE;
+ }
+
for( i = 0 ; i < nv ; ++i )
v[i]->measure = level ;
for( i = 0 ; i < nv ; ++i )
v[i]->measure = level ;