projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into output
[pspp-builds.git]
/
src
/
ui
/
terminal
/
read-line.c
diff --git
a/src/ui/terminal/read-line.c
b/src/ui/terminal/read-line.c
index 7b23f38d2f359b58ecec1635970904d732edad5c..f85e4e76b17a2aef2e9ca0c8aac27d8296341fcd 100644
(file)
--- a/
src/ui/terminal/read-line.c
+++ b/
src/ui/terminal/read-line.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2007
, 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
@@
-31,6
+31,7
@@
#include <data/file-name.h>
#include <data/settings.h>
#include <language/command.h>
#include <data/file-name.h>
#include <data/settings.h>
#include <language/command.h>
+#include <libpspp/cast.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
#include <libpspp/version.h>
@@
-107,8
+108,7
@@
static bool
read_interactive (struct getl_interface *s,
struct string *line)
{
read_interactive (struct getl_interface *s,
struct string *line)
{
- struct readln_source *is =
- (struct readln_source *) s ;
+ struct readln_source *is = UP_CAST (s, struct readln_source, parent);
return is->interactive_func (line, prompt_get_style ());
}
return is->interactive_func (line, prompt_get_style ());
}
@@
-215,7
+215,7
@@
create_readln_source (void)
rlns->parent.read = read_interactive;
rlns->parent.close = readln_close;
rlns->parent.read = read_interactive;
rlns->parent.close = readln_close;
- return
(struct getl_interface *) rlns
;
+ return
&rlns->parent
;
}
}