diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-09 16:47:01 +0000 |
---|---|---|
committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-09 16:47:01 +0000 |
commit | 9557ca00615d2a6e68785272357642779db26411 (patch) | |
tree | 92422b49b1683a494be7359b7cfd914631c124bb | |
parent | f49a5db1a745e99befbe4c02272e9ffa46b7edf6 (diff) | |
download | skalibs-9557ca00615d2a6e68785272357642779db26411.tar.xz |
Remove deprecated sig.c and useless select wrapper
-rw-r--r-- | package/deps.mak | 4 | ||||
-rw-r--r-- | src/include/skalibs/sig.h | 15 | ||||
-rw-r--r-- | src/libstddjb/fd_select.c | 14 | ||||
-rw-r--r-- | src/libstddjb/sig.c | 18 |
4 files changed, 1 insertions, 50 deletions
diff --git a/package/deps.mak b/package/deps.mak index 7e892ca..cbcbf69 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -311,7 +311,6 @@ src/libstddjb/fd_move2.o src/libstddjb/fd_move2.lo: src/libstddjb/fd_move2.c src src/libstddjb/fd_read.o src/libstddjb/fd_read.lo: src/libstddjb/fd_read.c src/include/skalibs/allreadwrite.h src/libstddjb/fd_readv.o src/libstddjb/fd_readv.lo: src/libstddjb/fd_readv.c src/include/skalibs/allreadwrite.h src/libstddjb/fd_recv.o src/libstddjb/fd_recv.lo: src/libstddjb/fd_recv.c src/include/skalibs/allreadwrite.h -src/libstddjb/fd_select.o src/libstddjb/fd_select.lo: src/libstddjb/fd_select.c src/libstddjb/fd_send.o src/libstddjb/fd_send.lo: src/libstddjb/fd_send.c src/include/skalibs/allreadwrite.h src/libstddjb/fd_sync.o src/libstddjb/fd_sync.lo: src/libstddjb/fd_sync.c src/include/skalibs/djbunix.h src/libstddjb/fd_write.o src/libstddjb/fd_write.lo: src/libstddjb/fd_write.c src/include/skalibs/allreadwrite.h @@ -467,7 +466,6 @@ src/libstddjb/selfpipe_trapset.o src/libstddjb/selfpipe_trapset.lo: src/libstddj src/libstddjb/selfpipe_untrap.o src/libstddjb/selfpipe_untrap.lo: src/libstddjb/selfpipe_untrap.c src/libstddjb/selfpipe-internal.h src/include/skalibs/selfpipe.h src/include/skalibs/sig.h src/include/skalibs/sysdeps.h src/libstddjb/sgetopt.o src/libstddjb/sgetopt.lo: src/libstddjb/sgetopt.c src/include/skalibs/buffer.h src/include/skalibs/sgetopt.h src/libstddjb/short_scan.o src/libstddjb/short_scan.lo: src/libstddjb/short_scan.c src/libstddjb/fmtscan-internal.h src/include/skalibs/ushort.h -src/libstddjb/sig.o src/libstddjb/sig.lo: src/libstddjb/sig.c src/include/skalibs/sig.h src/libstddjb/sig_block.o src/libstddjb/sig_block.lo: src/libstddjb/sig_block.c src/include/skalibs/sig.h src/libstddjb/sig_blocknone.o src/libstddjb/sig_blocknone.lo: src/libstddjb/sig_blocknone.c src/include/skalibs/sig.h src/libstddjb/sig_blockset.o src/libstddjb/sig_blockset.lo: src/libstddjb/sig_blockset.c src/include/skalibs/sig.h @@ -742,7 +740,7 @@ src/libunixonacid/unixmessage_bits_closeall.o src/libunixonacid/unixmessage_bits src/libunixonacid/unixmessage_bits_closenone.o src/libunixonacid/unixmessage_bits_closenone.lo: src/libunixonacid/unixmessage_bits_closenone.c src/include/skalibs/bitarray.h src/include/skalibs/unixmessage.h src/libunixonacid/unixmessage_handle.o src/libunixonacid/unixmessage_handle.lo: src/libunixonacid/unixmessage_handle.c src/include/skalibs/unixmessage.h src/libunixonacid/unixmessage_put.o src/libunixonacid/unixmessage_put.lo: src/libunixonacid/unixmessage_put.c src/include/skalibs/bitarray.h src/include/skalibs/bytestr.h src/include/skalibs/diuint.h src/include/skalibs/genalloc.h src/include/skalibs/siovec.h src/include/skalibs/stralloc.h src/include/skalibs/sysdeps.h src/include/skalibs/unixmessage.h -src/libunixonacid/unixmessage_receive.o src/libunixonacid/unixmessage_receive.lo: src/libunixonacid/unixmessage_receive.c src/include/skalibs/allreadwrite.h src/include/skalibs/cbuffer.h src/include/skalibs/diuint.h src/include/skalibs/djbunix.h src/include/skalibs/error.h src/include/skalibs/nonposix.h src/include/skalibs/siovec.h src/include/skalibs/stralloc.h src/include/skalibs/sysdeps.h src/include/skalibs/uint.h src/include/skalibs/unixmessage.h +src/libunixonacid/unixmessage_receive.o src/libunixonacid/unixmessage_receive.lo: src/libunixonacid/unixmessage_receive.c src/include/skalibs/allreadwrite.h src/include/skalibs/cbuffer.h src/include/skalibs/djbunix.h src/include/skalibs/error.h src/include/skalibs/nonposix.h src/include/skalibs/siovec.h src/include/skalibs/stralloc.h src/include/skalibs/sysdeps.h src/include/skalibs/uint.h src/include/skalibs/unixmessage.h src/libunixonacid/unixmessage_receiver_0.o src/libunixonacid/unixmessage_receiver_0.lo: src/libunixonacid/unixmessage_receiver_0.c src/include/skalibs/unixmessage.h src/libunixonacid/unixmessage_receiver_free.o src/libunixonacid/unixmessage_receiver_free.lo: src/libunixonacid/unixmessage_receiver_free.c src/include/skalibs/stralloc.h src/include/skalibs/unixmessage.h src/libunixonacid/unixmessage_receiver_init.o src/libunixonacid/unixmessage_receiver_init.lo: src/libunixonacid/unixmessage_receiver_init.c src/include/skalibs/cbuffer.h src/include/skalibs/stralloc.h src/include/skalibs/unixmessage.h diff --git a/src/include/skalibs/sig.h b/src/include/skalibs/sig.h index a463b63..7972e14 100644 --- a/src/include/skalibs/sig.h +++ b/src/include/skalibs/sig.h @@ -6,21 +6,6 @@ #include <signal.h> #include <skalibs/gccattributes.h> -extern int sig_alarm gccattr_deprecated ; -extern int sig_child gccattr_deprecated ; -extern int sig_stop gccattr_deprecated ; -extern int sig_cont gccattr_deprecated ; -extern int sig_hangup gccattr_deprecated ; -extern int sig_int gccattr_deprecated ; -extern int sig_kill gccattr_deprecated ; -extern int sig_pipe gccattr_deprecated ; -extern int sig_term gccattr_deprecated ; -extern int sig_usr1 gccattr_deprecated ; -extern int sig_usr2 gccattr_deprecated ; -extern int sig_quit gccattr_deprecated ; -extern int sig_abort gccattr_deprecated ; - - typedef void skasighandler_t (int) ; typedef skasighandler_t *skasighandler_t_ref ; diff --git a/src/libstddjb/fd_select.c b/src/libstddjb/fd_select.c deleted file mode 100644 index 846485d..0000000 --- a/src/libstddjb/fd_select.c +++ /dev/null @@ -1,14 +0,0 @@ -/* ISC license. */ - -#include <sys/types.h> -#include <errno.h> -#include <sys/select.h> - -int fd_select (int n, fd_set *rfds, fd_set *wfds, fd_set *xfds, struct timeval *tv) -{ - register int r ; - do - r = select(n, rfds, wfds, xfds, tv) ; - while ((r == -1) && (errno == EINTR)) ; - return r ; -} diff --git a/src/libstddjb/sig.c b/src/libstddjb/sig.c deleted file mode 100644 index 334b79a..0000000 --- a/src/libstddjb/sig.c +++ /dev/null @@ -1,18 +0,0 @@ -/* ISC license. */ - -#include <signal.h> -#include <skalibs/sig.h> - -int sig_alarm = SIGALRM ; -int sig_child = SIGCHLD ; -int sig_stop = SIGSTOP ; -int sig_cont = SIGCONT ; -int sig_hangup = SIGHUP ; -int sig_int = SIGINT ; -int sig_kill = SIGKILL ; -int sig_pipe = SIGPIPE ; -int sig_term = SIGTERM ; -int sig_usr1 = SIGUSR1 ; -int sig_usr2 = SIGUSR2 ; -int sig_quit = SIGQUIT ; -int sig_abort = SIGABRT ; |