apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r597875 - in /apr/apr-util/trunk/ssl: apr_ssl_openssl.c apr_ssl_winsock.c
Date Sat, 24 Nov 2007 16:33:51 GMT
Author: minfrin
Date: Sat Nov 24 08:33:50 2007
New Revision: 597875

URL: http://svn.apache.org/viewvc?rev=597875&view=rev
Log:
Propagate APU_DECLARE(apr_status_t) through the SSL code. No functional change.

Modified:
    apr/apr-util/trunk/ssl/apr_ssl_openssl.c
    apr/apr-util/trunk/ssl/apr_ssl_winsock.c

Modified: apr/apr-util/trunk/ssl/apr_ssl_openssl.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ssl/apr_ssl_openssl.c?rev=597875&r1=597874&r2=597875&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl_openssl.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl_openssl.c Sat Nov 24 08:33:50 2007
@@ -61,7 +61,7 @@
 /* The apr_ssl_factory_t structure will have the pool and purpose
  * fields set only.
  */
-apr_status_t apu_ssl_factory_create(apr_ssl_factory_t *asf,
+APU_DECLARE(apr_status_t) apu_ssl_factory_create(apr_ssl_factory_t *asf,
                                  const char *privateKeyFn,
                                  const char *certFn,
                                  const char *digestType)
@@ -100,7 +100,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_socket_create(apr_ssl_socket_t *sslSock, 
+APU_DECLARE(apr_status_t) apu_ssl_socket_create(apr_ssl_socket_t *sslSock, 
                                    apr_ssl_factory_t *asf)
 {
     apu_ssl_socket_data_t *sslData = apr_pcalloc(sslSock->pool, 
@@ -125,7 +125,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_socket_close(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_socket_close(apr_ssl_socket_t *sock)
 {
     int sslRv;
 
@@ -143,7 +143,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_connect(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_connect(apr_ssl_socket_t *sock)
 {
     int sslOp;
 
@@ -158,8 +158,8 @@
     return APR_EGENERAL;
 }
 
-apr_status_t apu_ssl_send(apr_ssl_socket_t *sock, const char *buf, 
-                          apr_size_t *len)
+APU_DECLARE(apr_status_t) apu_ssl_send(apr_ssl_socket_t *sock, const char *buf, 
+                                       apr_size_t *len)
 {
     int sslOp;
 
@@ -172,8 +172,8 @@
     return APR_EGENERAL; /* SSL error? */
 }
 
-apr_status_t apu_ssl_recv(apr_ssl_socket_t * sock,
-                              char *buf, apr_size_t *len)
+APU_DECLARE(apr_status_t) apu_ssl_recv(apr_ssl_socket_t * sock,
+                                       char *buf, apr_size_t *len)
 {
     int sslOp;
 
@@ -189,8 +189,8 @@
     return APR_EGENERAL; /* SSL error ? */
 }
 
-apr_status_t apu_ssl_accept(apr_ssl_socket_t *newSock, 
-                            apr_ssl_socket_t *oldSock, apr_pool_t *pool)
+APU_DECLARE(apr_status_t) apu_ssl_accept(apr_ssl_socket_t *newSock, 
+                                         apr_ssl_socket_t *oldSock, apr_pool_t *pool)
 {
     apu_ssl_socket_data_t *sslData = apr_pcalloc(pool, sizeof(*sslData));
     apr_os_sock_t fd;
@@ -219,7 +219,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_raw_error(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_raw_error(apr_ssl_socket_t *sock)
 {
     if (!sock->sslData)
         return APR_EINVAL;
@@ -230,7 +230,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apr_evp_crypt_cleanup(apr_evp_crypt_t *e)
+APU_DECLARE(apr_status_t) apr_evp_crypt_cleanup(apr_evp_crypt_t *e)
 {
 
 #if HAVE_DECL_EVP_PKEY_CTX_NEW
@@ -254,7 +254,7 @@
     return apr_evp_crypt_cleanup(f);
 }
 
-apr_status_t apr_evp_factory_cleanup(apr_evp_factory_t *f)
+APU_DECLARE(apr_status_t) apr_evp_factory_cleanup(apr_evp_factory_t *f)
 {
     apu_evp_data_t *evpData = f->evpData;
     int i;
@@ -282,15 +282,15 @@
     return apr_evp_factory_cleanup(f);
 }
 
-apr_status_t apr_evp_factory_create(apr_evp_factory_t **newFactory,
-                                    const char *privateKeyFn, 
-                                    const char *certFn, 
-                                    const char *cipherName,
-                                    const char *passphrase,
-                                    const char *engine,
-                                    const char *digest,
-                                    apr_evp_factory_type_e purpose,
-                                    apr_pool_t *pool)
+APU_DECLARE(apr_status_t) apr_evp_factory_create(apr_evp_factory_t **newFactory,
+                                                 const char *privateKeyFn, 
+                                                 const char *certFn, 
+                                                 const char *cipherName,
+                                                 const char *passphrase,
+                                                 const char *engine,
+                                                 const char *digest,
+                                                 apr_evp_factory_type_e purpose,
+                                                 apr_pool_t *pool)
 {
     apr_evp_factory_t *f = (apr_evp_factory_t *)apr_pcalloc(pool, sizeof(apr_evp_factory_t));
     apu_evp_data_t *data;
@@ -359,11 +359,11 @@
 
 }
 
-apr_status_t apr_evp_crypt_init(apr_evp_factory_t *f,
-                                apr_evp_crypt_t **e,
-                                apr_evp_crypt_type_e type,
-                                apr_evp_crypt_key_e key,
-                                apr_pool_t *p)
+APU_DECLARE(apr_status_t) apr_evp_crypt_init(apr_evp_factory_t *f,
+                                             apr_evp_crypt_t **e,
+                                             apr_evp_crypt_type_e type,
+                                             apr_evp_crypt_key_e key,
+                                             apr_pool_t *p)
 {
     apu_evp_data_t *data = f->evpData;
 
@@ -423,11 +423,11 @@
 
 }
 
-apr_status_t apr_evp_crypt(apr_evp_crypt_t *e,
-                           unsigned char **out,
-                           apr_size_t *outlen,
-                           const unsigned char *in,
-                           apr_size_t inlen)
+APU_DECLARE(apr_status_t) apr_evp_crypt(apr_evp_crypt_t *e,
+                                        unsigned char **out,
+                                        apr_size_t *outlen,
+                                        const unsigned char *in,
+                                        apr_size_t inlen)
 {
     unsigned char *buffer;
 
@@ -497,9 +497,9 @@
 
 }
 
-apr_status_t apr_evp_crypt_finish(apr_evp_crypt_t *e,
-                                  unsigned char *out,
-                                  apr_size_t *outlen)
+APU_DECLARE(apr_status_t) apr_evp_crypt_finish(apr_evp_crypt_t *e,
+                                               unsigned char *out,
+                                               apr_size_t *outlen)
 {
 
     switch (e->purpose) {

Modified: apr/apr-util/trunk/ssl/apr_ssl_winsock.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/ssl/apr_ssl_winsock.c?rev=597875&r1=597874&r2=597875&view=diff
==============================================================================
--- apr/apr-util/trunk/ssl/apr_ssl_winsock.c (original)
+++ apr/apr-util/trunk/ssl/apr_ssl_winsock.c Sat Nov 24 08:33:50 2007
@@ -35,7 +35,7 @@
 #include "apr_ssl_private.h"
 #include "apr_ssl_winsock_private.h"
 
-apr_status_t apu_ssl_init(void)
+APU_DECLARE(apr_status_t) apu_ssl_init(void)
 {
     return APR_SUCCESS;
 }
@@ -54,7 +54,7 @@
 //    sock->sslData->sslErr = SSL_get_error(sock->sslData->ssl, fncode);
 //}
 
-apr_status_t apu_ssl_factory_create(apr_ssl_factory_t *asf,
+APU_DECLARE(apr_status_t) apu_ssl_factory_create(apr_ssl_factory_t *asf,
                                  const char *privateKeyFn,
                                  const char *certFn,
                                  const char *digestType)
@@ -94,8 +94,8 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_socket_create(apr_ssl_socket_t *sslSock, 
-                                   apr_ssl_factory_t *asf)
+APU_DECLARE(apr_status_t) apu_ssl_socket_create(apr_ssl_socket_t *sslSock, 
+                                                apr_ssl_factory_t *asf)
 {
     apu_ssl_socket_data_t *sslData = apr_pcalloc(sslSock->pool, 
                                                  sizeof(*sslData));
@@ -172,7 +172,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_socket_close(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_socket_close(apr_ssl_socket_t *sock)
 {
 //    int sslRv;
 //    apr_status_t rv;
@@ -190,7 +190,7 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apu_ssl_connect(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_connect(apr_ssl_socket_t *sock)
 {
 //    int sslOp;
 //
@@ -205,20 +205,22 @@
     return -1;
 }
 
-apr_status_t apu_ssl_send(apr_ssl_socket_t *sock, const char *buf, 
-                          apr_size_t *len)
+APU_DECLARE(apr_status_t) apu_ssl_send(apr_ssl_socket_t *sock,
+                                       const char *buf, 
+                                       apr_size_t *len)
 {
     return apr_socket_send(sock->plain, buf, len);
 }
 
-apr_status_t apu_ssl_recv(apr_ssl_socket_t *sock,
-                              char *buf, apr_size_t *len)
+APU_DECLARE(apr_status_t) apu_ssl_recv(apr_ssl_socket_t *sock,
+                                       char *buf, apr_size_t *len)
 {
     return apr_socket_recv(sock->plain, buf, len);
 }
 
-apr_status_t apu_ssl_accept(apr_ssl_socket_t *newSock, 
-                            apr_ssl_socket_t *oldSock, apr_pool_t *pool)
+APU_DECLARE(apr_status_t) apu_ssl_accept(apr_ssl_socket_t *newSock, 
+                                         apr_ssl_socket_t *oldSock,
+                                         apr_pool_t *pool)
 {
     apu_ssl_socket_data_t *sslData = apr_pcalloc(pool, sizeof(*sslData));
     apr_status_t ret;
@@ -234,7 +236,7 @@
     return ret;
 }
 
-apr_status_t apu_ssl_raw_error(apr_ssl_socket_t *sock)
+APU_DECLARE(apr_status_t) apu_ssl_raw_error(apr_ssl_socket_t *sock)
 {
     if (!sock->sslData)
         return APR_EINVAL;
@@ -245,50 +247,50 @@
     return APR_SUCCESS;
 }
 
-apr_status_t apr_evp_crypt_cleanup(apr_evp_crypt_t *e)
+APU_DECLARE(apr_status_t) apr_evp_crypt_cleanup(apr_evp_crypt_t *e)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t apr_evp_factory_cleanup(apr_evp_factory_t *f)
+APU_DECLARE(apr_status_t) apr_evp_factory_cleanup(apr_evp_factory_t *f)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t apr_evp_factory_create(apr_evp_factory_t **newFactory,
-                                    const char *privateKeyFn, 
-                                    const char *certFn, 
-                                    const char *cipherName,
-                                    const char *passphrase,
-                                    const char *engine,
-                                    const char *digest,
-                                    apr_evp_factory_type_e purpose,
-                                    apr_pool_t *pool)
+APU_DECLARE(apr_status_t) apr_evp_factory_create(apr_evp_factory_t **newFactory,
+                                                 const char *privateKeyFn, 
+                                                 const char *certFn, 
+                                                 const char *cipherName,
+                                                 const char *passphrase,
+                                                 const char *engine,
+                                                 const char *digest,
+                                                 apr_evp_factory_type_e purpose,
+                                                 apr_pool_t *pool)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t apr_status_t apr_evp_crypt_init(apr_evp_factory_t *f,
-                                             apr_evp_crypt_t **e,
-                                             apr_evp_crypt_type_e type,
-                                             apr_evp_crypt_key_e key,
-                                             apr_pool_t *p)
+APU_DECLARE(apr_status_t) apr_status_t apr_evp_crypt_init(apr_evp_factory_t *f,
+                                                          apr_evp_crypt_t **e,
+                                                          apr_evp_crypt_type_e type,
+                                                          apr_evp_crypt_key_e key,
+                                                          apr_pool_t *p)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t apr_evp_crypt(apr_evp_crypt_t *,
-                           unsigned char **out,
-                           apr_size_t *outlen,
-                           const unsigned char *in,
-                           apr_size_t inlen)
+APU_DECLARE(apr_status_t) apr_evp_crypt(apr_evp_crypt_t *,
+                                        unsigned char **out,
+                                        apr_size_t *outlen,
+                                        const unsigned char *in,
+                                        apr_size_t inlen)
 {
     return APR_ENOTIMPL;
 }
 
-apr_status_t apr_evp_crypt_finish(apr_evp_crypt_t *e,
-                                  unsigned char *out,
-                                  apr_size_t *outlen);
+APU_DECLARE(apr_status_t) apr_evp_crypt_finish(apr_evp_crypt_t *e,
+                                               unsigned char *out,
+                                               apr_size_t *outlen);
 {
     return APR_ENOTIMPL;
 }



Mime
View raw message