diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-08-19 00:13:55 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-08-19 00:13:55 +0200 |
commit | 512c35950752d1482d87c5052c8d923e0d16ad15 (patch) | |
tree | addcf59dc0f2986a706e41858e7f271013fe58ec /libguile/scmsigs.c | |
parent | 3c13664ebe86c87223d59db7dc7187be9d32b8d7 (diff) | |
download | guile-512c35950752d1482d87c5052c8d923e0d16ad15.tar.gz |
Remove unneeded `scm_without_guile ()' call.
* libguile/scmsigs.c (read_without_guile_data, do_read_without_guile,
read_without_guile): Remove.
(signal_delivery_thread): Use read(2) instead of `read_without_guile ()'.
Diffstat (limited to 'libguile/scmsigs.c')
-rw-r--r-- | libguile/scmsigs.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index f4772b7a2..d9b36c574 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -148,32 +148,6 @@ take_signal (int signum) #endif } -typedef struct { - ssize_t res; - int fd; - char *buf; - size_t n; -} read_without_guile_data; - -static void * -do_read_without_guile (void *raw_data) -{ - read_without_guile_data *data = (read_without_guile_data *)raw_data; - data->res = read (data->fd, data->buf, data->n); - return NULL; -} - -static ssize_t -read_without_guile (int fd, char *buf, size_t n) -{ - read_without_guile_data data; - data.fd = fd; - data.buf = buf; - data.n = n; - scm_without_guile (do_read_without_guile, &data); - return data.res; -} - static SCM signal_delivery_thread (void *data) { @@ -187,7 +161,7 @@ signal_delivery_thread (void *data) while (1) { - n = read_without_guile (signal_pipe[0], &sigbyte, 1); + n = read (signal_pipe[0], &sigbyte, 1); sig = sigbyte; if (n == 1 && sig >= 0 && sig < NSIG) { |