From: Steve Dickson Date: Wed, 13 Oct 2010 14:15:12 +0000 (-0400) Subject: Fix style nits in atomicio.c X-Git-Tag: nfs-utils-1-2-4-rc1~17 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9afbdbad4436df6f7a5a501c6e4db04c3a5bbb08;p=nfs-utils.git Fix style nits in atomicio.c Signed-off-by: Jim Rees Signed-off-by: Steve Dickson --- diff --git a/support/nfs/atomicio.c b/support/nfs/atomicio.c index 1fb1ff9..5e760e6 100644 --- a/support/nfs/atomicio.c +++ b/support/nfs/atomicio.c @@ -28,25 +28,15 @@ #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ - /* * ensure all of data on socket comes through. f==read || f==write */ -ssize_t -atomicio( - ssize_t (*f) (int, void*, size_t), - int fd, - void *_s, - size_t n) +ssize_t atomicio(ssize_t(*f) (int, void *, size_t), int fd, void *_s, size_t n) { char *s = _s; - ssize_t res; - size_t pos = 0; + ssize_t res, pos = 0; - while (n > pos) { + while ((ssize_t)n > pos) { res = (f) (fd, s + pos, n - pos); switch (res) { case -1: @@ -54,11 +44,11 @@ atomicio( continue; case 0: if (pos != 0) - return (pos); - return (res); + return pos; + return res; default: pos += res; } } - return (pos); + return pos; }