summaryrefslogtreecommitdiff
path: root/libavformat/tls.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-16 22:53:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-16 23:09:08 +0100
commitced26a2c653b5dfff19b12d66fb5035ded563dac (patch)
treef88cf10a021596b566114e80a57a5d2355659d3c /libavformat/tls.c
parent6e3651983c7c7b18043c7aa7d3b782c5159c3b8a (diff)
avformat/tls: add () to protect macro arguments
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tls.c')
-rw-r--r--libavformat/tls.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/libavformat/tls.c b/libavformat/tls.c
index a19415d9c0..65b263aef6 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -30,27 +30,27 @@
#if CONFIG_GNUTLS
#include <gnutls/gnutls.h>
#include <gnutls/x509.h>
-#define TLS_read(c, buf, size) gnutls_record_recv(c->session, buf, size)
-#define TLS_write(c, buf, size) gnutls_record_send(c->session, buf, size)
-#define TLS_shutdown(c) gnutls_bye(c->session, GNUTLS_SHUT_RDWR)
+#define TLS_read(c, buf, size) gnutls_record_recv((c)->session, (buf), (size))
+#define TLS_write(c, buf, size) gnutls_record_send((c)->session, (buf), (size))
+#define TLS_shutdown(c) gnutls_bye((c)->session, GNUTLS_SHUT_RDWR)
#define TLS_free(c) do { \
- if (c->session) \
- gnutls_deinit(c->session); \
- if (c->cred) \
- gnutls_certificate_free_credentials(c->cred); \
+ if ((c)->session) \
+ gnutls_deinit((c)->session); \
+ if ((c)->cred) \
+ gnutls_certificate_free_credentials((c)->cred); \
} while (0)
#elif CONFIG_OPENSSL
#include <openssl/bio.h>
#include <openssl/ssl.h>
#include <openssl/err.h>
-#define TLS_read(c, buf, size) SSL_read(c->ssl, buf, size)
-#define TLS_write(c, buf, size) SSL_write(c->ssl, buf, size)
-#define TLS_shutdown(c) SSL_shutdown(c->ssl)
+#define TLS_read(c, buf, size) SSL_read((c)->ssl, (buf), (size))
+#define TLS_write(c, buf, size) SSL_write((c)->ssl, (buf), (size))
+#define TLS_shutdown(c) SSL_shutdown((c)->ssl)
#define TLS_free(c) do { \
- if (c->ssl) \
- SSL_free(c->ssl); \
- if (c->ctx) \
- SSL_CTX_free(c->ctx); \
+ if ((c)->ssl) \
+ SSL_free((c)->ssl); \
+ if ((c)->ctx) \
+ SSL_CTX_free((c)->ctx); \
} while (0)
#endif
#if HAVE_POLL_H