cvs commit: apr/poll/unix poll.c

[dreid]

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;
   }