From 5d6810d9eb833f923f1543fbb369823f7cd289df Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 5 Dec 2014 18:04:58 +0000 Subject: It's possible to statically initialize unixmessage_receiver_0 --- src/libunixonacid/skaclient_server_01x.c | 21 --------------------- src/libunixonacid/unixmessage_receiver_0.c | 7 +------ 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 src/libunixonacid/skaclient_server_01x.c (limited to 'src/libunixonacid') diff --git a/src/libunixonacid/skaclient_server_01x.c b/src/libunixonacid/skaclient_server_01x.c deleted file mode 100644 index e55e8cd..0000000 --- a/src/libunixonacid/skaclient_server_01x.c +++ /dev/null @@ -1,21 +0,0 @@ -/* ISC license. */ - -/* MT-unsafe */ - -#include -#include -#include - -int skaclient_server_01x_init (char const *before, unsigned int beforelen, char const *after, unsigned int afterlen, tain_t const *deadline, tain_t *stamp) -{ - return unixmessage_receiver_0_init() && skaclient_server_init( - unixmessage_receiver_0, - unixmessage_sender_1, - unixmessage_sender_x, - before, - beforelen, - after, - afterlen, - deadline, - stamp) ; -} diff --git a/src/libunixonacid/unixmessage_receiver_0.c b/src/libunixonacid/unixmessage_receiver_0.c index b43bdfb..6d48daa 100644 --- a/src/libunixonacid/unixmessage_receiver_0.c +++ b/src/libunixonacid/unixmessage_receiver_0.c @@ -7,9 +7,4 @@ static char mainbuf[UNIXMESSAGE_BUFSIZE] ; static char auxbuf[UNIXMESSAGE_AUXBUFSIZE] ; -unixmessage_receiver_t unixmessage_receiver_0_ = UNIXMESSAGE_RECEIVER_ZERO ; - -int unixmessage_receiver_0_init () -{ - return unixmessage_receiver_init(&unixmessage_receiver_0_, 0, mainbuf, UNIXMESSAGE_BUFSIZE, auxbuf, UNIXMESSAGE_AUXBUFSIZE) ; -} +UNIXMESSAGE_RECEIVER_DECLARE_AND_INIT(unixmessage_receiver_0_, 0, mainbuf, UNIXMESSAGE_BUFSIZE, auxbuf, UNIXMESSAGE_AUXBUFSIZE) ; -- cgit v1.3.1