summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Djurfeldt <djurfeldt@nada.kth.se>2000-03-12 16:02:46 +0000
committerMikael Djurfeldt <djurfeldt@nada.kth.se>2000-03-12 16:02:46 +0000
commitbc858b80ca9cf4ed1afd57073023ee978b012e2b (patch)
treee3d52e4b42c2d0561fee2b228003ffc0c32e4c47
parent0cd87628385e5e35595c6b1e842fd7fb19ef5bba (diff)
downloadguile-bc858b80ca9cf4ed1afd57073023ee978b012e2b.tar.gz
* readline.c (current_input_getc): Don't pass int values through
SCM variables.
-rw-r--r--guile-readline/readline.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 1bb289fe9..9480b3d88 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -125,17 +125,12 @@ static SCM before_read;
static int
current_input_getc (FILE *in)
{
- SCM ans;
if (promptp && SCM_NIMP (before_read))
{
scm_apply (before_read, SCM_EOL, SCM_EOL);
promptp = 0;
}
- ans = scm_getc (input_port);
- /* GJB:FIXME:: why not just
- return scm_getc(input_port);
- */
- return ans;
+ return scm_getc (input_port);
}
static void
@@ -470,7 +465,7 @@ find_matching_paren(int k)
static int
match_paren (int x, int k)
{
- int tmp;
+ int tmp, fno;
SELECT_TYPE readset;
struct timeval timeout;
@@ -487,7 +482,8 @@ match_paren (int x, int k)
timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000;
FD_ZERO (&readset);
- FD_SET (fileno (rl_instream), &readset);
+ fno = fileno (rl_instream);
+ FD_SET (fno, &readset);
if (rl_point > 1)
{
@@ -496,7 +492,7 @@ match_paren (int x, int k)
if (rl_point > -1)
{
rl_redisplay ();
- scm_internal_select (fileno + 1, &readset, NULL, NULL, &timeout);
+ scm_internal_select (fno + 1, &readset, NULL, NULL, &timeout);
}
rl_point = tmp;
}