cvs commit: apr-util/ldap apr_ldap_init.c

[minfrin]

minfrin     2004/08/03 16:26:11

  Modified:    include  apr_ldap_init.h
               ldap     apr_ldap_init.c
  Log:
  Make the order of the arguments consistent with idea of the pool being
  passed first.
  
  Revision  Changes    Path
  1.2       +14 -0     apr-util/include/apr_ldap_init.h
  
  Index: apr_ldap_init.h
  ===================================================================
  RCS file: /home/cvs/apr-util/include/apr_ldap_init.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_ldap_init.h   30 Jul 2004 19:40:44 -0000      1.1
  +++ apr_ldap_init.h   3 Aug 2004 23:26:10 -0000       1.2
  @@ -29,6 +29,20 @@
   #define APR_LDAP_CA_TYPE_BASE64   2
   #define APR_LDAP_CA_TYPE_CERT7_DB 3
   
  +APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
  +                                   const char *cert_auth_file,
  +                                   int cert_file_type,
  +                                   apr_ldap_err_t **result_err);
  +
  +APU_DECLARE(int) apr_ldap_ssl_deinit();
  +
  +APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
  +                               LDAP **ldap,
  +                               const char *hostname,
  +                               int portno,
  +                               int secure,
  +                               apr_ldap_err_t **result_err);
  +
   #endif /* APR_HAS_LDAP */
   
   #endif /* APR_LDAP_URL_H */
  
  
  
  1.4       +4 -4      apr-util/ldap/apr_ldap_init.c
  
  Index: apr_ldap_init.c
  ===================================================================
  RCS file: /home/cvs/apr-util/ldap/apr_ldap_init.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- apr_ldap_init.c   1 Aug 2004 16:55:14 -0000       1.3
  +++ apr_ldap_init.c   3 Aug 2004 23:26:11 -0000       1.4
  @@ -40,10 +40,10 @@
    * will return APR_EGENERAL. Further LDAP specific error information
    * can be found in result_err.
    */
  -APU_DECLARE(int) apr_ldap_ssl_init(apr_ldap_err_t **result_err,
  +APU_DECLARE(int) apr_ldap_ssl_init(apr_pool_t *pool,
                                      const char *cert_auth_file,
                                      int cert_file_type,
  -                                   apr_pool_t *pool) {
  +                                   apr_ldap_err_t **result_err) {
   
       apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, 
sizeof(apr_ldap_err_t));
       *result_err = result;
  @@ -184,12 +184,12 @@
    * assumes that any certificate setup necessary has already
    * been done.
    */
  -APU_DECLARE(int) apr_ldap_init(apr_ldap_err_t **result_err,
  +APU_DECLARE(int) apr_ldap_init(apr_pool_t *pool,
                                  LDAP **ldap,
                                  const char *hostname,
                                  int portno,
                                  int secure,
  -                               apr_pool_t *pool) {
  +                               apr_ldap_err_t **result_err) {
   
       apr_ldap_err_t *result = (apr_ldap_err_t *)apr_pcalloc(pool, 
sizeof(apr_ldap_err_t));
       *result_err = result;