You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by ia...@apache.org on 2003/12/29 22:03:49 UTC

cvs commit: apr/test testrand2.c

ianh        2003/12/29 13:03:49

  Modified:    .        CHANGES
               include  apr_errno.h
               test     testrand2.c
  Log:
  doxygen fixes
  new status check APR_STATUS_IS_ENOTENOUGHENTROPY
  
  Submitted by:	 Sander Temme <sander at temme dot net>
  
  Revision  Changes    Path
  1.448     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.447
  retrieving revision 1.448
  diff -u -r1.447 -r1.448
  --- CHANGES	16 Dec 2003 18:24:03 -0000	1.447
  +++ CHANGES	29 Dec 2003 21:03:49 -0000	1.448
  @@ -7,6 +7,9 @@
   
   Changes with APR 1.0
   
  +  *) new error status APR_STATUS_IS_ENOTENOUGHENTROPY, Doxygen fixes
  +     [Sander Temme <sander at temme dot net]
  +
     *) Add apr_socket_type_get() for retrieving the type (e.g., stream)
        of the socket.  [Philippe M. Chiasson]
   
  
  
  
  1.115     +4 -2      apr/include/apr_errno.h
  
  Index: apr_errno.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_errno.h,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -u -r1.114 -r1.115
  --- apr_errno.h	3 Nov 2003 13:25:00 -0000	1.114
  +++ apr_errno.h	29 Dec 2003 21:03:49 -0000	1.115
  @@ -307,7 +307,7 @@
   #define APR_ESYMNOTFOUND   (APR_OS_START_ERROR + 26)
   /** @see APR_STATUS_IS_EPROC_UNKNOWN */
   #define APR_EPROC_UNKNOWN  (APR_OS_START_ERROR + 27)
  -
  +/** @see APR_STATUS_IS_ENOTENOUGHENTROPY */
   #define APR_ENOTENOUGHENTROPY (APR_OS_START_ERROR + 28)
   /** @} */
   
  @@ -397,6 +397,9 @@
   /** The given process was not recognized by APR. */
   #define APR_STATUS_IS_EPROC_UNKNOWN(s)  ((s) == APR_EPROC_UNKNOWN)
   
  +/** APR could not gather enough entropy to continue. */
  +#define APR_STATUS_IS_ENOTENOUGHENTROPY(s) ((s) == APR_ENOTENOUGHENTROPY)
  +
   /** @} */
   
   /** 
  @@ -1147,7 +1150,6 @@
    */
   #define apr_get_netos_error() (errno)
   #define apr_set_netos_error(e) (errno = (e))
  -/** @} */
   
   /** 
    * @addtogroup APR_STATUS_IS
  
  
  
  1.6       +1 -1      apr/test/testrand2.c
  
  Index: testrand2.c
  ===================================================================
  RCS file: /home/cvs/apr/test/testrand2.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- testrand2.c	16 Nov 2003 23:49:15 -0000	1.5
  +++ testrand2.c	29 Dec 2003 21:03:49 -0000	1.6
  @@ -134,7 +134,7 @@
       for(i=0 ; i < count ; ++i)
           rand_add_zeroes(r);
       rv=f(r,c,1);
  -    CuAssertIntEquals(tc,rv,APR_ENOTENOUGHENTROPY);
  +    CuAssertIntEquals(tc,1,APR_STATUS_IS_ENOTENOUGHENTROPY(rv));
       }
   
   static void rand_seed_short(CuTest *tc)