RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/tls: add () to protect macro arguments 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-02-16 22:53:28 +01:00
parent 6e3651983c
commit ced26a2c65
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/tls.c
View File

@ -30,27 +30,27 @@
#if CONFIG_GNUTLS #if CONFIG_GNUTLS
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#define TLS_read(c, buf, size) gnutls_record_recv(c->session, buf, size) #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_write(c, buf, size) gnutls_record_send((c)->session, (buf), (size))
#define TLS_shutdown(c) gnutls_bye(c->session, GNUTLS_SHUT_RDWR) #define TLS_shutdown(c) gnutls_bye((c)->session, GNUTLS_SHUT_RDWR)
#define TLS_free(c) do { \ #define TLS_free(c) do { \
if (c->session) \ if ((c)->session) \
gnutls_deinit(c->session); \ gnutls_deinit((c)->session); \
if (c->cred) \ if ((c)->cred) \
gnutls_certificate_free_credentials(c->cred); \ gnutls_certificate_free_credentials((c)->cred); \
} while (0) } while (0)
#elif CONFIG_OPENSSL #elif CONFIG_OPENSSL
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/err.h> #include <openssl/err.h>
#define TLS_read(c, buf, size) SSL_read(c->ssl, buf, size) #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_write(c, buf, size) SSL_write((c)->ssl, (buf), (size))
#define TLS_shutdown(c) SSL_shutdown(c->ssl) #define TLS_shutdown(c) SSL_shutdown((c)->ssl)
#define TLS_free(c) do { \ #define TLS_free(c) do { \
if (c->ssl) \ if ((c)->ssl) \
SSL_free(c->ssl); \ SSL_free((c)->ssl); \
if (c->ctx) \ if ((c)->ctx) \
SSL_CTX_free(c->ctx); \ SSL_CTX_free((c)->ctx); \
} while (0) } while (0)
#endif #endif
#if HAVE_POLL_H #if HAVE_POLL_H