Return-Path: <rooneg@apache.org>
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 1808 invoked by uid 99); 6 Dec 2004 02:55:34 -0000
X-ASF-Spam-Status: No, hits=-10.0 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Sun, 05 Dec 2004 18:55:33 -0800
Received: (qmail 32367 invoked by uid 65534); 6 Dec 2004 02:55:32 -0000
Date: 6 Dec 2004 02:55:32 -0000
Message-ID: <20041206025532.32360.qmail@minotaur.apache.org>
From: rooneg@apache.org
To: commits@apr.apache.org
Subject: svn commit: r109938 -
 /apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
 /apr/apr/trunk/poll/unix/port.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Virus-Checked: Checked

Author: rooneg
Date: Sun Dec  5 18:55:31 2004
New Revision: 109938

URL: http://svn.apache.org/viewcvs?view=rev&rev=109938
Log:
Fix some style problems in the poll code, no functional changes.

* include/arch/unix/apr_arch_poll_private.h
  (pollset_lock_rings, pollset_unlock_rings): add a space after the if.

* poll/unix/port.c
  (apr_pollset_remove): add a space after an if.
  (apr_pollset_poll): wrap a long line, add a space after an if, remove some
   extraneous parentheses that caused a long line to go past 80 columns.

Modified:
   apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
   apr/apr/trunk/poll/unix/port.c

Modified: apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h?view=diff&rev=109938&p1=apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h&r1=109937&p2=apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h&r2=109938
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h	(original)
+++ apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h	Sun Dec  5 18:55:31 2004
@@ -77,10 +77,10 @@
 #if APR_HAS_THREADS
 #include "apr_thread_mutex.h"
 #define pollset_lock_rings() \
-    if(pollset->flags & APR_POLLSET_THREADSAFE) \
+    if (pollset->flags & APR_POLLSET_THREADSAFE) \
         apr_thread_mutex_lock(pollset->ring_lock);
 #define pollset_unlock_rings() \
-    if(pollset->flags & APR_POLLSET_THREADSAFE) \
+    if (pollset->flags & APR_POLLSET_THREADSAFE) \
         apr_thread_mutex_unlock(pollset->ring_lock);
 #else
 #define pollset_lock_rings()

Modified: apr/apr/trunk/poll/unix/port.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/poll/unix/port.c?view=diff&rev=109938&p1=apr/apr/trunk/poll/unix/port.c&r1=109937&p2=apr/apr/trunk/poll/unix/port.c&r2=109938
==============================================================================
--- apr/apr/trunk/poll/unix/port.c	(original)
+++ apr/apr/trunk/poll/unix/port.c	Sun Dec  5 18:55:31 2004
@@ -203,7 +203,7 @@
 
     res = port_dissociate(pollset->port_fd, PORT_SOURCE_FD, fd);
 
-    if(res < 0) {
+    if (res < 0) {
         rv = APR_NOTFOUND;
     }
 
@@ -284,13 +284,14 @@
 
     pollset_unlock_rings();
 
-    ret = port_getn(pollset->port_fd, pollset->port_set,  pollset->nalloc, &nget, tvptr);
+    ret = port_getn(pollset->port_fd, pollset->port_set, pollset->nalloc,
+                    &nget, tvptr);
 
     (*num) = nget;
 
     if (ret == -1) {
         (*num) = 0;
-        if(errno == ETIME || errno == EINTR) {
+        if (errno == ETIME || errno == EINTR) {
             rv = APR_TIMEUP;
         }
         else {
@@ -309,7 +310,7 @@
                 get_revent(pollset->port_set[i].portev_events);
 
             APR_RING_INSERT_TAIL(&(pollset->add_ring), 
-                                 ((pfd_elem_t*)(pollset->port_set[i].portev_user)), 
+                                 (pfd_elem_t*)pollset->port_set[i].portev_user,
                                  pfd_elem_t, link);
         }