diff options
author | Michael Steinert <mike.steinert@gmail.com> | 2012-12-03 12:53:53 -0700 |
---|---|---|
committer | Alan Antonuk <alan.antonuk@gmail.com> | 2013-04-09 15:54:49 -0700 |
commit | 173e563d3fcd87a03a65a9444d284d71a121e5b4 (patch) | |
tree | c0fddf724598fd29ae52ab704b9dec1985daf221 /librabbitmq | |
parent | 12e068b65110f1780379459b96c28a4f5662109e (diff) | |
download | rabbitmq-c-github-ask-173e563d3fcd87a03a65a9444d284d71a121e5b4.tar.gz |
Start addressing review comments
Signed-off-by: Michael Steinert <mike.steinert@gmail.com>
Diffstat (limited to 'librabbitmq')
-rw-r--r-- | librabbitmq/CMakeLists.txt | 10 | ||||
-rw-r--r-- | librabbitmq/amqp_connection.c | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_cyassl.c (renamed from librabbitmq/amqp-cyassl.c) | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_gnutls.c (renamed from librabbitmq/amqp-gnutls.c) | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_openssl.c (renamed from librabbitmq/amqp-openssl.c) | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_polarssl.c (renamed from librabbitmq/amqp-polarssl.c) | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_private.h | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_socket.h (renamed from librabbitmq/amqp-socket.h) | 0 | ||||
-rw-r--r-- | librabbitmq/amqp_ssl_socket.h (renamed from librabbitmq/amqp-ssl-socket.h) | 4 | ||||
-rw-r--r-- | librabbitmq/amqp_tcp_socket.c (renamed from librabbitmq/amqp-tcp-socket.c) | 2 | ||||
-rw-r--r-- | librabbitmq/amqp_tcp_socket.h (renamed from librabbitmq/amqp-tcp-socket.h) | 0 |
11 files changed, 16 insertions, 12 deletions
diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt index 3a42a19..52e2682 100644 --- a/librabbitmq/CMakeLists.txt +++ b/librabbitmq/CMakeLists.txt @@ -80,23 +80,23 @@ if (ENABLE_SSL_SUPPORT) add_definitions(-DWITH_SSL=1) if (SSL_ENGINE STREQUAL "OpenSSL") - set(AMQP_SSL_SRCS amqp-ssl-socket.h amqp-openssl.c) + set(AMQP_SSL_SRCS amqp_ssl_socket.h amqp_openssl.c) include_directories(${OPENSSL_INCLUDE_DIR}) set(AMQP_SSL_LIBS ${OPENSSL_LIBRARIES}) elseif (SSL_ENGINE STREQUAL "cyaSSL") - set(AMQP_SSL_SRCS amqp-ssl-socket.h amqp-cyassl.c) + set(AMQP_SSL_SRCS amqp_ssl_socket.h amqp_cyassl.c) include_directories(${CYASSL_INCLUDE_DIR}) set(AMQP_SSL_LIBS ${CYASSL_LIBRARIES}) elseif (SSL_ENGINE STREQUAL "GnuTLS") - set(AMQP_SSL_SRCS amqp-ssl-socket.h amqp-gnutls.c) + set(AMQP_SSL_SRCS amqp_ssl_socket.h amqp_gnutls.c) include_directories(${GNUTLS_INCLUDE_DIR}) add_definitions(${GNUTLS_DEFINITIONS}) set(AMQP_SSL_LIBS ${GNUTLS_LIBRARIES}) elseif (SSL_ENGINE STREQUAL "PolarSSL") - set(AMQP_SSL_SRCS amqp-ssl-socket.h amqp-polarssl.c) + set(AMQP_SSL_SRCS amqp_ssl_socket.h amqp_polarssl.c) include_directories(${POLARSSL_INCLUDE_DIR}) set(AMQP_SSL_LIBS ${POLARSSL_LIBRARIES}) @@ -118,7 +118,7 @@ set(RABBITMQ_SOURCES ${AMQP_FRAMING_H_PATH} ${AMQP_FRAMING_C_PATH} amqp_api.c amqp.h amqp_connection.c amqp_mem.c amqp_private.h amqp_socket.c - amqp_table.c amqp_url.c amqp-socket.h amqp-tcp-socket.c amqp-tcp-socket.h + amqp_table.c amqp_url.c amqp_socket.h amqp_tcp_socket.c amqp_tcp_socket.h ${SOCKET_IMPL}/socket.h ${SOCKET_IMPL}/socket.c ${AMQP_SSL_SRCS} ) diff --git a/librabbitmq/amqp_connection.c b/librabbitmq/amqp_connection.c index 4666100..f468f16 100644 --- a/librabbitmq/amqp_connection.c +++ b/librabbitmq/amqp_connection.c @@ -38,7 +38,7 @@ #include "config.h" #endif -#include "amqp-tcp-socket.h" +#include "amqp_tcp_socket.h" #include "amqp_private.h" #include <assert.h> #include <errno.h> diff --git a/librabbitmq/amqp-cyassl.c b/librabbitmq/amqp_cyassl.c index f3ee909..1daf7a9 100644 --- a/librabbitmq/amqp-cyassl.c +++ b/librabbitmq/amqp_cyassl.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "amqp-ssl-socket.h" +#include "amqp_ssl_socket.h" #include "amqp_private.h" #include <cyassl/ssl.h> #include <stdlib.h> diff --git a/librabbitmq/amqp-gnutls.c b/librabbitmq/amqp_gnutls.c index 66b3def..93273d7 100644 --- a/librabbitmq/amqp-gnutls.c +++ b/librabbitmq/amqp_gnutls.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "amqp-ssl-socket.h" +#include "amqp_ssl_socket.h" #include "amqp_private.h" #include <gnutls/gnutls.h> #include <gnutls/x509.h> diff --git a/librabbitmq/amqp-openssl.c b/librabbitmq/amqp_openssl.c index 04be202..c3451ae 100644 --- a/librabbitmq/amqp-openssl.c +++ b/librabbitmq/amqp_openssl.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "amqp-ssl-socket.h" +#include "amqp_ssl_socket.h" #include "amqp_private.h" #include "threads.h" #include <ctype.h> diff --git a/librabbitmq/amqp-polarssl.c b/librabbitmq/amqp_polarssl.c index 125918f..1c7c9f3 100644 --- a/librabbitmq/amqp-polarssl.c +++ b/librabbitmq/amqp_polarssl.c @@ -24,7 +24,7 @@ #include "config.h" #endif -#include "amqp-ssl-socket.h" +#include "amqp_ssl_socket.h" #include "amqp_private.h" #include <polarssl/ctr_drbg.h> #include <polarssl/entropy.h> diff --git a/librabbitmq/amqp_private.h b/librabbitmq/amqp_private.h index d32f664..7f22ce8 100644 --- a/librabbitmq/amqp_private.h +++ b/librabbitmq/amqp_private.h @@ -92,7 +92,7 @@ char * amqp_os_error_string(int err); -#include "amqp-socket.h" +#include "amqp_socket.h" /* * Connection states: XXX FIX THIS diff --git a/librabbitmq/amqp-socket.h b/librabbitmq/amqp_socket.h index a40d13e..a40d13e 100644 --- a/librabbitmq/amqp-socket.h +++ b/librabbitmq/amqp_socket.h diff --git a/librabbitmq/amqp-ssl-socket.h b/librabbitmq/amqp_ssl_socket.h index 87bce35..706d537 100644 --- a/librabbitmq/amqp-ssl-socket.h +++ b/librabbitmq/amqp_ssl_socket.h @@ -30,6 +30,8 @@ #include <amqp.h> +AMQP_BEGIN_DECLS + /** * Create a new SSL/TLS socket object. * @@ -131,4 +133,6 @@ void AMQP_CALL amqp_set_initialize_ssl_library(amqp_boolean_t do_initialize); +AMQP_END_DECLS + #endif /* AMQP_SSL_H */ diff --git a/librabbitmq/amqp-tcp-socket.c b/librabbitmq/amqp_tcp_socket.c index d6e6fdb..84d8554 100644 --- a/librabbitmq/amqp-tcp-socket.c +++ b/librabbitmq/amqp_tcp_socket.c @@ -25,7 +25,7 @@ #endif #include "amqp_private.h" -#include "amqp-tcp-socket.h" +#include "amqp_tcp_socket.h" #include <stdio.h> #include <stdlib.h> diff --git a/librabbitmq/amqp-tcp-socket.h b/librabbitmq/amqp_tcp_socket.h index 6e0afa0..6e0afa0 100644 --- a/librabbitmq/amqp-tcp-socket.h +++ b/librabbitmq/amqp_tcp_socket.h |