diff options
| author | Jason Parker <jparker@digium.com> | 2013-03-11 15:48:13 -0500 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-03-11 15:48:13 -0500 |
| commit | a6e924672c45dc9253c63b1aee5f40c23c6ee4bb (patch) | |
| tree | e1f1e3bfe75f94dcf9d921f986f194c9c089beff /pjlib | |
| parent | 5bc7e156fa63dad11e98c6cec49548e31f5b0c06 (diff) | |
| parent | c4117957402e119fa4f5dcaae62478fb0a7c8aaf (diff) | |
Merge branch 'patch/fix-warnings' of github.com:asterisk/pjproject
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/src/pj/log.c | 6 | ||||
| -rw-r--r-- | pjlib/src/pj/pool_buf.c | 2 | ||||
| -rw-r--r-- | pjlib/src/pj/ssl_sock_ossl.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c index 04173eb..e06ac7b 100644 --- a/pjlib/src/pj/log.c +++ b/pjlib/src/pj/log.c @@ -106,7 +106,7 @@ static void log_set_indent(int indent) pj_thread_local_set(thread_indent_tls_id, (void*)(long)indent); } -static int log_get_raw_indent() +static int log_get_raw_indent(void) { return (long)pj_thread_local_get(thread_indent_tls_id); } @@ -118,13 +118,13 @@ static void log_set_indent(int indent) if (log_indent < 0) log_indent = 0; } -static int log_get_raw_indent() +static int log_get_raw_indent(void) { return log_indent; } #endif /* PJ_LOG_ENABLE_INDENT && PJ_HAS_THREADS */ -static int log_get_indent() +static int log_get_indent(void) { int indent = log_get_raw_indent(); return indent > LOG_MAX_INDENT ? LOG_MAX_INDENT : indent; diff --git a/pjlib/src/pj/pool_buf.c b/pjlib/src/pj/pool_buf.c index b9044b2..0d4c8a6 100644 --- a/pjlib/src/pj/pool_buf.c +++ b/pjlib/src/pj/pool_buf.c @@ -43,7 +43,7 @@ static void pool_buf_cleanup(void) is_initialized = 0; } -static pj_status_t pool_buf_initialize() +static pj_status_t pool_buf_initialize(void) { pj_atexit(&pool_buf_cleanup); diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c index 4b1d0a7..483c3e1 100644 --- a/pjlib/src/pj/ssl_sock_ossl.c +++ b/pjlib/src/pj/ssl_sock_ossl.c @@ -614,8 +614,8 @@ static pj_status_t create_ssl(pj_ssl_sock_t *ssock) /* Setup SSL BIOs */ ssock->ossl_rbio = BIO_new(BIO_s_mem()); ssock->ossl_wbio = BIO_new(BIO_s_mem()); - BIO_set_close(ssock->ossl_rbio, BIO_CLOSE); - BIO_set_close(ssock->ossl_wbio, BIO_CLOSE); + (void)BIO_set_close(ssock->ossl_rbio, BIO_CLOSE); + (void)BIO_set_close(ssock->ossl_wbio, BIO_CLOSE); SSL_set_bio(ssock->ossl_ssl, ssock->ossl_rbio, ssock->ossl_wbio); return PJ_SUCCESS; @@ -1277,7 +1277,7 @@ static pj_status_t flush_write_bio(pj_ssl_sock_t *ssock, pj_memcpy(&wdata->data, data, len); /* Reset write BIO */ - BIO_reset(ssock->ossl_wbio); + (void)BIO_reset(ssock->ossl_wbio); /* Ticket #1573: Don't hold mutex while calling PJLIB socket send(). */ pj_lock_release(ssock->write_mutex); |