From: Jim Meyering Date: Wed, 1 Oct 2008 07:43:40 +0000 (+0200) Subject: remove trailing spaces X-Git-Tag: v0.1~6920 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=9c9a9765811eb1e698517065953e09d6b8c07400;p=gnulib.git remove trailing spaces * NEWS: Likewise. * lib/poll.c (poll): Likewise. * lib/sys_socket.in.h (SHUT_RDWR): Likewise. * lib/winsock.c (rpl_close): Likewise. * m4/memcmp.m4 (gl_FUNC_MEMCMP): Likewise. * modules/yield: Likewise. * tests/test-poll.c (connect_to_socket, poll1): Likewise. * tests/test-sys_select.c (connect_to_socket): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 5ef986eac..6bccdbd24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2008-10-01 Jim Meyering + remove trailing spaces + * NEWS: Likewise. + * lib/poll.c (poll): Likewise. + * lib/sys_socket.in.h (SHUT_RDWR): Likewise. + * lib/winsock.c (rpl_close): Likewise. + * m4/memcmp.m4 (gl_FUNC_MEMCMP): Likewise. + * modules/yield: Likewise. + * tests/test-poll.c (connect_to_socket, poll1): Likewise. + * tests/test-sys_select.c (connect_to_socket): Likewise. + fts.c: adjust a new interface to be more generally useful * lib/fts.c (dirent_inode_sort_may_be_useful): Take an FD parameter. (fts_build): Adjust caller. @@ -10,7 +20,7 @@ * tests/test-cond.c: New file. 2008-09-30 Yoann Vandoorselaere - Bruno Haible + Bruno Haible * modules/cond (Dependencies): Add errno, time. * lib/glthread/cond.h: Include . @@ -18,12 +28,12 @@ across platforms. 2008-09-30 Yoann Vandoorselaere - Bruno Haible + Bruno Haible * m4/thread.m4 (gl_THREAD): Fix detection of pthread_atfork function. 2008-09-30 Yoann Vandoorselaere - Bruno Haible + Bruno Haible * modules/tls-tests (Depends-on): Add thread, yield. (configure.ac): Remove all checks. @@ -34,7 +44,7 @@ (test_tls): Pass an additional NULL argument to gl_thread_join. 2008-09-30 Yoann Vandoorselaere - Bruno Haible + Bruno Haible * modules/lock-tests (Depends-on): Add thread, yield. (configure.ac): Remove all checks. diff --git a/NEWS b/NEWS index c2624a3a4..ef04cf440 100644 --- a/NEWS +++ b/NEWS @@ -22,7 +22,7 @@ Date Modules Changes will simply improve your code's portability between POSIX platforms and Windows. In particular, you will be able to use ioctl and - close instead of ioctlsocket and closesocket, + close instead of ioctlsocket and closesocket, and test errno instead of WSAGetLastError (). On the other hand, you have to audit your code to remove usage of these Winsock-specific functions. diff --git a/lib/poll.c b/lib/poll.c index b4001283d..da0484482 100644 --- a/lib/poll.c +++ b/lib/poll.c @@ -543,7 +543,7 @@ poll (pfd, nfd, timeout) ev.lNetworkEvents |= FD_WRITE | FD_CONNECT; if (FD_ISSET ((SOCKET) h, &xfds)) ev.lNetworkEvents |= FD_OOB; - + happened = win32_compute_revents_socket ((SOCKET) h, pfd[i].events, ev.lNetworkEvents); } diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 145408fd6..6d7dc7669 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -109,7 +109,7 @@ typedef int socklen_t; extern "C" { # endif -/* Re-define FD_ISSET to avoid a WSA call while we are not using +/* Re-define FD_ISSET to avoid a WSA call while we are not using network sockets. */ static inline int rpl_fd_isset (int fd, fd_set * set) diff --git a/lib/winsock.c b/lib/winsock.c index 0a991994b..535145a81 100644 --- a/lib/winsock.c +++ b/lib/winsock.c @@ -61,7 +61,7 @@ rpl_close (int fd) /* FIXME: other applications, like squid, use an undocumented _free_osfhnd free function. Instead, here we just close twice the file descriptor. I could not get the former to work - (pb, Sep 22 2008). */ + (pb, Sep 22 2008). */ int r = closesocket (sock); _close (fd); return r; diff --git a/m4/memcmp.m4 b/m4/memcmp.m4 index a8d87b930..c995a3298 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_MEMCMP], ]], [[int ret = memcmp ("foo", "bar", 0);]])], [ac_cv_func_memcmp_working=yes], [ac_cv_func_memcmp_working=no])]) - fi + fi AC_FUNC_MEMCMP dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp). if test $ac_cv_func_memcmp_working = no; then diff --git a/modules/yield b/modules/yield index 6eb7580e8..24ffcdd24 100644 --- a/modules/yield +++ b/modules/yield @@ -12,7 +12,7 @@ configure.ac: gl_YIELD Makefile.am: -lib_SOURCES += glthread/yield.h +lib_SOURCES += glthread/yield.h Include: "glthread/yield.h" diff --git a/tests/test-poll.c b/tests/test-poll.c index b0cdb6087..bbfefe43e 100644 --- a/tests/test-poll.c +++ b/tests/test-poll.c @@ -130,10 +130,10 @@ connect_to_socket (int blocking) #ifdef WIN32_NATIVE unsigned long iMode = 1; ioctl (s, FIONBIO, (char *) &iMode); - + #elif defined F_GETFL int oldflags = fcntl (s, F_GETFL, NULL); - + if (!(oldflags & O_NONBLOCK)) fcntl (s, F_SETFL, oldflags | O_NONBLOCK); #endif @@ -161,7 +161,7 @@ poll1 (int fd, int ev, int time) pfd.fd = fd; pfd.events = ev; pfd.revents = 0; - r = poll (&pfd, 1, time); + r = poll (&pfd, 1, time); if (r < 0) return r; diff --git a/tests/test-sys_select.c b/tests/test-sys_select.c index 053b6c68d..a4e0f3e58 100644 --- a/tests/test-sys_select.c +++ b/tests/test-sys_select.c @@ -135,10 +135,10 @@ connect_to_socket (int blocking) #ifdef WIN32_NATIVE unsigned long iMode = 1; ioctl (s, FIONBIO, (char *) &iMode); - + #elif defined F_GETFL int oldflags = fcntl (s, F_GETFL, NULL); - + if (!(oldflags & O_NONBLOCK)) fcntl (s, F_SETFL, oldflags | O_NONBLOCK); #endif