diff options
author | Jason Parker <jparker@digium.com> | 2013-01-31 22:03:44 +0000 |
---|---|---|
committer | Jason Parker <jparker@digium.com> | 2013-01-31 22:03:44 +0000 |
commit | 5b41fbfe8bad25fd5f631fa06ce006892950254f (patch) | |
tree | 00ced4e92d7a545f0af4a452de7ec1075ed68624 /res | |
parent | 5899e13112c59579e5b555ae3fc8f680e192d069 (diff) |
Multiple revisions 380735-380736
........
r380735 | qwell | 2013-01-31 15:40:09 -0600 (Thu, 31 Jan 2013) | 1 line
Fix a few compiler warnings.
........
r380736 | qwell | 2013-01-31 15:42:34 -0600 (Thu, 31 Jan 2013) | 1 line
Ignore warnings caused by PJ_TODO()s in pjproject.
........
Merged revisions 380735-380736 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r-- | res/pjproject/pjlib/include/pj/config_site.h | 1 | ||||
-rw-r--r-- | res/pjproject/pjlib/src/pj/log.c | 6 | ||||
-rw-r--r-- | res/pjproject/pjlib/src/pj/pool_buf.c | 2 | ||||
-rw-r--r-- | res/pjproject/pjlib/src/pj/ssl_sock_ossl.c | 6 | ||||
-rw-r--r-- | res/pjproject/pjmedia/src/test/test.c | 4 | ||||
-rw-r--r-- | res/pjproject/pjsip-apps/src/samples/icedemo.c | 22 |
6 files changed, 18 insertions, 23 deletions
diff --git a/res/pjproject/pjlib/include/pj/config_site.h b/res/pjproject/pjlib/include/pj/config_site.h index 65dc1d210..553eaae56 100644 --- a/res/pjproject/pjlib/include/pj/config_site.h +++ b/res/pjproject/pjlib/include/pj/config_site.h @@ -20,6 +20,7 @@ */ #define PJ_HAS_IPV6 1 +#define PJ_TODO(id) /* * Typical configuration for WinCE target. diff --git a/res/pjproject/pjlib/src/pj/log.c b/res/pjproject/pjlib/src/pj/log.c index 86bfefddd..5d56d8ed9 100644 --- a/res/pjproject/pjlib/src/pj/log.c +++ b/res/pjproject/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/res/pjproject/pjlib/src/pj/pool_buf.c b/res/pjproject/pjlib/src/pj/pool_buf.c index 83561681b..5e88981e9 100644 --- a/res/pjproject/pjlib/src/pj/pool_buf.c +++ b/res/pjproject/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/res/pjproject/pjlib/src/pj/ssl_sock_ossl.c b/res/pjproject/pjlib/src/pj/ssl_sock_ossl.c index 559b51344..fbb5a49ce 100644 --- a/res/pjproject/pjlib/src/pj/ssl_sock_ossl.c +++ b/res/pjproject/pjlib/src/pj/ssl_sock_ossl.c @@ -602,8 +602,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; @@ -1145,7 +1145,7 @@ static pj_status_t flush_write_bio(pj_ssl_sock_t *ssock, } /* Reset write BIO after flushed */ - BIO_reset(ssock->ossl_wbio); + (void)BIO_reset(ssock->ossl_wbio); if (status == PJ_EPENDING) { /* Update write state */ diff --git a/res/pjproject/pjmedia/src/test/test.c b/res/pjproject/pjmedia/src/test/test.c index 275d2da0a..df07ad01d 100644 --- a/res/pjproject/pjmedia/src/test/test.c +++ b/res/pjproject/pjmedia/src/test/test.c @@ -47,10 +47,10 @@ void app_perror(pj_status_t status, const char *msg) * https://trac.pjsip.org/repos/ticket/1337 */ #if PJMEDIA_HAS_G711_CODEC==0 -int dummy() +void *dummy() { // Dummy - return (int) &pjmedia_plc_save; + return &pjmedia_plc_save; } #endif diff --git a/res/pjproject/pjsip-apps/src/samples/icedemo.c b/res/pjproject/pjsip-apps/src/samples/icedemo.c index 79bdb5fac..32d6e5db7 100644 --- a/res/pjproject/pjsip-apps/src/samples/icedemo.c +++ b/res/pjproject/pjsip-apps/src/samples/icedemo.c @@ -514,9 +514,9 @@ static void icedemo_stop_session(void) reset_rem_info(); } -#define PRINT(fmt, arg0, arg1, arg2, arg3, arg4, arg5) \ +#define PRINT(...) \ printed = pj_ansi_snprintf(p, maxlen - (p-buffer), \ - fmt, arg0, arg1, arg2, arg3, arg4, arg5); \ + __VA_ARGS__); \ if (printed <= 0) return -PJ_ETOOSMALL; \ p += printed @@ -539,8 +539,7 @@ static int print_cand(char buffer[], unsigned maxlen, (unsigned)pj_sockaddr_get_port(&cand->addr)); PRINT("%s\n", - pj_ice_get_cand_type_name(cand->type), - 0, 0, 0, 0, 0); + pj_ice_get_cand_type_name(cand->type)); if (p == buffer+maxlen) return -PJ_ETOOSMALL; @@ -562,8 +561,7 @@ static int encode_session(char buffer[], unsigned maxlen) pj_status_t status; /* Write "dummy" SDP v=, o=, s=, and t= lines */ - PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n", - 0, 0, 0, 0, 0, 0); + PRINT("v=0\no=- 3414953978 3414953978 IN IP4 localhost\ns=ice\nt=0 0\n"); /* Get ufrag and pwd from current session */ pj_ice_strans_get_ufrag_pwd(icedemo.icest, &local_ufrag, &local_pwd, @@ -574,8 +572,7 @@ static int encode_session(char buffer[], unsigned maxlen) (int)local_ufrag.slen, local_ufrag.ptr, (int)local_pwd.slen, - local_pwd.ptr, - 0, 0); + local_pwd.ptr); /* Write each component */ for (comp=0; comp<icedemo.opt.comp_cnt; ++comp) { @@ -595,22 +592,19 @@ static int encode_session(char buffer[], unsigned maxlen) "c=IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else if (comp==1) { /* For component 2, default address is in a=rtcp line */ PRINT("a=rtcp:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } else { /* For other components, we'll just invent this.. */ PRINT("a=Xice-defcand:%d IN IP4 %s\n", (int)pj_sockaddr_get_port(&cand[0].addr), pj_sockaddr_print(&cand[0].addr, ipaddr, - sizeof(ipaddr), 0), - 0, 0, 0, 0); + sizeof(ipaddr), 0)); } /* Enumerate all candidates for this component */ |