You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2005/01/13 10:16:56 UTC
svn commit: r125051 - /apr/apr-util/trunk/ldap/apr_ldap_option.c
Author: jorton
Date: Thu Jan 13 01:16:55 2005
New Revision: 125051
URL: http://svn.apache.org/viewcvs?view=rev&rev=125051
Log:
* ldap/apr_ldap_option.c (option_set_tls, option_set_cert): Fix gcc
lack-of-prototype warnings; declare as static. (and fix code style)
Modified:
apr/apr-util/trunk/ldap/apr_ldap_option.c
Modified: apr/apr-util/trunk/ldap/apr_ldap_option.c
Url: http://svn.apache.org/viewcvs/apr/apr-util/trunk/ldap/apr_ldap_option.c?view=diff&rev=125051&p1=apr/apr-util/trunk/ldap/apr_ldap_option.c&r1=125050&p2=apr/apr-util/trunk/ldap/apr_ldap_option.c&r2=125051
==============================================================================
--- apr/apr-util/trunk/ldap/apr_ldap_option.c (original)
+++ apr/apr-util/trunk/ldap/apr_ldap_option.c Thu Jan 13 01:16:55 2005
@@ -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 @@
* 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 @@
* 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