[PATCH 1/2] nfs-utils: Clean up support/nfs/rpcmisc.c:closedown()
DORMANTno replies
From: Chuck Lever <hidden>
Date: 2008-10-02 15:54:45
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2008-10-08 · Re: [PATCH 1/2] nfs-utils: Clean up support/nfs/rpcmisc.c:closedown() · Steve Dickson <hidden>
Clean up: update closedown()'s synopsis to modern C style, and move the function so we can remove the forward declaration. Signed-off-by: Chuck Lever <redacted> --- support/nfs/rpcmisc.c | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/support/nfs/rpcmisc.c b/support/nfs/rpcmisc.c
index aa23601..dab2be8 100644
--- a/support/nfs/rpcmisc.c
+++ b/support/nfs/rpcmisc.c@@ -37,7 +37,6 @@ #define socklen_t int #endif -static void closedown(int sig); static int makesock(int port, int proto); #define _RPCSVC_CLOSEDOWN 120
@@ -45,6 +44,31 @@ int _rpcpmstart = 0; int _rpcfdtype = 0; int _rpcsvcdirty = 0; +static void +closedown(int sig) +{ + (void) signal(sig, closedown); + + if (_rpcsvcdirty == 0) { + static int size; + int i, openfd; + + if (_rpcfdtype == SOCK_DGRAM) + exit(0); + + if (size == 0) + size = getdtablesize(); + + for (i = 0, openfd = 0; i < size && openfd < 2; i++) + if (FD_ISSET(i, &svc_fdset)) + openfd++; + if (openfd <= 1) + exit(0); + } + + (void) alarm(_RPCSVC_CLOSEDOWN); +} + void rpc_init(char *name, int prog, int vers, void (*dispatch)(struct svc_req *, register SVCXPRT *),
@@ -139,28 +163,6 @@ rpc_init(char *name, int prog, int vers, } } -static void closedown(sig) -int sig; -{ - (void) signal(sig, closedown); - if (_rpcsvcdirty == 0) { - static int size; - int i, openfd; - - if (_rpcfdtype == SOCK_DGRAM) - exit(0); - if (size == 0) { - size = getdtablesize(); - } - for (i = 0, openfd = 0; i < size && openfd < 2; i++) - if (FD_ISSET(i, &svc_fdset)) - openfd++; - if (openfd <= 1) - exit(0); - } - (void) alarm(_RPCSVC_CLOSEDOWN); -} - /* * Create listener socket for a given port *