diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-13 09:16:55 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2005-01-13 09:16:55 +0000 |
| commit | 73c322f7adb846828e238903610e5dfe621d50e4 (patch) | |
| tree | b03f9d2f18097bd417b94f3b4ce62722eba44801 | |
| parent | c06b8fb851aa7ec04eefd32d3256a169029930b8 (diff) | |
| download | libapr-util-73c322f7adb846828e238903610e5dfe621d50e4.tar.gz | |
* ldap/apr_ldap_option.c (option_set_tls, option_set_cert): Fix gcc
lack-of-prototype warnings; declare as static. (and fix code style)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@125051 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | ldap/apr_ldap_option.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/ldap/apr_ldap_option.c b/ldap/apr_ldap_option.c index 789dc1c1..97e84680 100644 --- a/ldap/apr_ldap_option.c +++ b/ldap/apr_ldap_option.c @@ -1,4 +1,4 @@ -/* Copyright 2000-2004 The Apache Software Foundation +/* Copyright 2000-2005 The Apache Software Foundation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,11 @@ #if APR_HAS_LDAP +static int option_set_cert(apr_pool_t *pool, LDAP *ldap, const void *invalue, + apr_ldap_err_t *result); +static int option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, + apr_ldap_err_t *result); + /** * APR LDAP get option function * @@ -129,11 +134,9 @@ APU_DECLARE(int) apr_ldap_set_option(apr_pool_t *pool, * APR_LDAP_STARTTLS: STARTTLS encryption * APR_LDAP_STOPTLS: Stop existing TLS connecttion */ -int option_set_tls(apr_pool_t *pool, - LDAP *ldap, - const void *invalue, - apr_ldap_err_t *result) { - +static int option_set_tls(apr_pool_t *pool, LDAP *ldap, const void *invalue, + apr_ldap_err_t *result) +{ int tls = * (const int *)invalue; #if APR_HAS_LDAP_SSL /* compiled with ssl support */ @@ -298,11 +301,9 @@ int option_set_tls(apr_pool_t *pool, * Microsoft: unknown * Solaris: unknown */ -int option_set_cert(apr_pool_t *pool, - LDAP *ldap, - const void *invalue, - apr_ldap_err_t *result) { - +static int option_set_cert(apr_pool_t *pool, LDAP *ldap, + const void *invalue, apr_ldap_err_t *result) +{ apr_ldap_opt_tls_cert_t *cert = (apr_ldap_opt_tls_cert_t *)invalue; #if APR_HAS_LDAP_SSL |