projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
language
/
control
/
do-if.c
diff --git
a/src/language/control/do-if.c
b/src/language/control/do-if.c
index 2e1e0abf5f4deb412db249189cb489b298f72e0d..b3b6135f6ec4336e26a30e71da855d25c41d1e4f 100644
(file)
--- a/
src/language/control/do-if.c
+++ b/
src/language/control/do-if.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000
, 2009
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
@@
-26,12
+26,12
@@
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
-#include <libpspp/alloc.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
#include <libpspp/compiler.h>
#include <libpspp/message.h>
-#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/str.h>
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@
-240,7
+240,7
@@
do_if_finalize_func (void *do_if_ UNUSED)
Checks each clause and jumps to the appropriate
transformation. */
static int
Checks each clause and jumps to the appropriate
transformation. */
static int
-do_if_trns_proc (void *do_if_, struct ccase *c, casenumber case_num UNUSED)
+do_if_trns_proc (void *do_if_, struct ccase *
*
c, casenumber case_num UNUSED)
{
struct do_if_trns *do_if = do_if_;
struct clause *clause;
{
struct do_if_trns *do_if = do_if_;
struct clause *clause;
@@
-250,7
+250,7
@@
do_if_trns_proc (void *do_if_, struct ccase *c, casenumber case_num UNUSED)
{
if (clause->condition != NULL)
{
{
if (clause->condition != NULL)
{
- double boolean = expr_evaluate_num (clause->condition, c, case_num);
+ double boolean = expr_evaluate_num (clause->condition,
*
c, case_num);
if (boolean == 1.0)
return clause->target_index;
else if (boolean == SYSMIS)
if (boolean == 1.0)
return clause->target_index;
else if (boolean == SYSMIS)
@@
-279,7
+279,8
@@
do_if_trns_free (void *do_if_)
/* Breaks out of a DO IF construct. */
static int
/* Breaks out of a DO IF construct. */
static int
-break_trns_proc (void *do_if_, struct ccase *c UNUSED, casenumber case_num UNUSED)
+break_trns_proc (void *do_if_, struct ccase **c UNUSED,
+ casenumber case_num UNUSED)
{
struct do_if_trns *do_if = do_if_;
{
struct do_if_trns *do_if = do_if_;