From cvs-return-5352-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sat Nov 22 10:53:47 2003 Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 40831 invoked from network); 22 Nov 2003 10:53:47 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 22 Nov 2003 10:53:47 -0000 Received: (qmail 64094 invoked by uid 500); 22 Nov 2003 10:53:20 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 64045 invoked by uid 500); 22 Nov 2003 10:53:20 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 64031 invoked from network); 22 Nov 2003 10:53:20 -0000 Date: 22 Nov 2003 10:53:46 -0000 Message-ID: <20031122105346.40808.qmail@minotaur.apache.org> From: dreid@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/poll/unix poll.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dreid 2003/11/22 02:53:46 Modified: poll/unix poll.c Log: This small fix allows for the passing of NULL as the descriptors arg in apr_pollset_poll. Basically if we have a single item pollset then we don't need to have the descriptors arg set as the return value is sufficient. I haven't added this for OS/2 as Brian may be moving the code into a seperate file again. Revision Changes Path 1.42 +4 -2 apr/poll/unix/poll.c Index: poll.c =================================================================== RCS file: /home/cvs/apr/poll/unix/poll.c,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- poll.c 21 Nov 2003 19:50:02 -0000 1.41 +++ poll.c 22 Nov 2003 10:53:46 -0000 1.42 @@ -542,7 +542,8 @@ j++; } } - *descriptors = pollset->result_set; + if (descriptors) + *descriptors = pollset->result_set; return APR_SUCCESS; } @@ -616,7 +617,8 @@ } } - *descriptors = pollset->result_set; + if (descriptors) + *descriptors = pollset->result_set; return APR_SUCCESS; }