diff options
| author | msvensson@neptunus.(none) <> | 2006-03-10 16:41:14 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-03-10 16:41:14 +0100 |
| commit | aa3abd155006319f4c2bcdcbd119eac3cc89b977 (patch) | |
| tree | 9de9174f30edd59e8d180336d9b764255478a2f1 /vio/vio.c | |
| parent | 1442be9798ae042f97e3cba60a3323b2c3577118 (diff) | |
| download | mariadb-git-aa3abd155006319f4c2bcdcbd119eac3cc89b977.tar.gz | |
Cleanup SSL implementation
Remove duplicate code
Merge common functions
Enforce MySQL coding standard
Diffstat (limited to 'vio/vio.c')
| -rw-r--r-- | vio/vio.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vio/vio.c b/vio/vio.c index bc286b2d2bb..21a824a4016 100644 --- a/vio/vio.c +++ b/vio/vio.c @@ -88,19 +88,19 @@ static void vio_init(Vio* vio, enum enum_vio_type type, if (type == VIO_TYPE_SSL) { vio->viodelete =vio_delete; - vio->vioerrno =vio_ssl_errno; + vio->vioerrno =vio_errno; vio->read =vio_ssl_read; vio->write =vio_ssl_write; - vio->fastsend =vio_ssl_fastsend; - vio->viokeepalive =vio_ssl_keepalive; - vio->should_retry =vio_ssl_should_retry; - vio->was_interrupted=vio_ssl_was_interrupted; + vio->fastsend =vio_fastsend; + vio->viokeepalive =vio_keepalive; + vio->should_retry =vio_should_retry; + vio->was_interrupted=vio_was_interrupted; vio->vioclose =vio_ssl_close; - vio->peer_addr =vio_ssl_peer_addr; - vio->in_addr =vio_ssl_in_addr; + vio->peer_addr =vio_peer_addr; + vio->in_addr =vio_in_addr; vio->vioblocking =vio_ssl_blocking; vio->is_blocking =vio_is_blocking; - vio->timeout =vio_ssl_timeout; + vio->timeout =vio_timeout; } else /* default is VIO_TYPE_TCPIP */ #endif /* HAVE_OPENSSL */ |