From a119f35451826ee0b79007b4cd3fccc57c601b0c Mon Sep 17 00:00:00 2001
From: Vittorio Giovara <vittorio.giovara@savoirfairelinux.com>
Date: Fri, 25 Apr 2014 14:33:49 -0400
Subject: [PATCH] pjsip: fix a few minor warnings reported from clang
Change-Id: Idb337999f032e7240f7d715434f66edccae52367
Refs: #46066
---
.../pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c | 4 ++--
daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c | 6 +-----
.../pjproject-2.2.1/pjlib/src/pjlib-test/exception.c | 2 +-
.../pjmedia/src/pjmedia-codec/audio_codecs.c | 2 ++
.../libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c | 11 ++++++++++-
5 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c
index d80f442266..2f62432c07 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c
+++ b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/ioqueue_common_abs.c
@@ -497,13 +497,13 @@ void ioqueue_dispatch_read_event( pj_ioqueue_t *ioqueue, pj_ioqueue_key_t *h )
bytes_read = read_op->size;
- if ((read_op->op == PJ_IOQUEUE_OP_RECV_FROM)) {
+ if (read_op->op == PJ_IOQUEUE_OP_RECV_FROM) {
read_op->op = PJ_IOQUEUE_OP_NONE;
rc = pj_sock_recvfrom(h->fd, read_op->buf, &bytes_read,
read_op->flags,
read_op->rmt_addr,
read_op->rmt_addrlen);
- } else if ((read_op->op == PJ_IOQUEUE_OP_RECV)) {
+ } else if (read_op->op == PJ_IOQUEUE_OP_RECV) {
read_op->op = PJ_IOQUEUE_OP_NONE;
rc = pj_sock_recv(h->fd, read_op->buf, &bytes_read,
read_op->flags);
diff --git a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
index d3242237a3..fbc6c1149f 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
+++ b/daemon/libs/pjproject-2.2.1/pjlib/src/pj/pool.c
@@ -141,11 +141,7 @@ PJ_DEF(void*) pj_pool_allocate_find(pj_pool_t *pool, pj_size_t size)
p = pj_pool_alloc_from_block(block, size);
pj_assert(p != NULL);
-#if PJ_DEBUG
- if (p == NULL) {
- p = p;
- }
-#endif
+
return p;
}
diff --git a/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c b/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
index 4d4b1cd732..d9953aeb34 100644
--- a/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
+++ b/daemon/libs/pjproject-2.2.1/pjlib/src/pjlib-test/exception.c
@@ -120,7 +120,7 @@ static int test(void)
* No exception situation.
*/
PJ_TRY {
- rc = rc;
+ rc = 0;
}
PJ_CATCH_ANY {
rc = -3;
diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
index 0c218213e1..66ae236d3b 100644
--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
+++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/pjmedia-codec/audio_codecs.c
@@ -34,7 +34,9 @@ pjmedia_codec_register_audio_codecs(pjmedia_endpt *endpt,
const pjmedia_audio_codec_config *c)
{
pjmedia_audio_codec_config default_cfg;
+#if PJMEDIA_HAS_PASSTHROUGH_CODECS
pj_status_t status;
+#endif
PJ_ASSERT_RETURN(endpt, PJ_EINVAL);
if (!c) {
diff --git a/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c b/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
index df68511bde..5df6356b62 100644
--- a/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
+++ b/daemon/libs/pjproject-2.2.1/pjmedia/src/test/mips_test.c
@@ -682,7 +682,10 @@ struct codec_port
pj_uint16_t pcm[32000 * PTIME / 1000];
};
-
+#if PJMEDIA_HAS_L16_CODEC || \
+ PJMEDIA_HAS_OPENCORE_AMRWB_CODEC || PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || \
+ PJMEDIA_HAS_G7221_CODEC || PJMEDIA_HAS_G722_CODEC || PJMEDIA_HAS_G711_CODEC || \
+ PJMEDIA_HAS_SPEEX_CODEC || PJMEDIA_HAS_ILBC_CODEC || PJMEDIA_HAS_GSM_CODEC
static pj_status_t codec_put_frame(struct pjmedia_port *this_port,
pjmedia_frame *frame)
{
@@ -792,6 +795,7 @@ static pjmedia_port* codec_encode_decode( pj_pool_t *pool,
return &cp->base;
}
+#endif
#if PJMEDIA_HAS_G711_CODEC
/* G.711 benchmark */
@@ -1696,6 +1700,10 @@ static void stream_port_custom_deinit(struct test_entry *te)
}
+#if PJMEDIA_HAS_L16_CODEC || \
+ PJMEDIA_HAS_OPENCORE_AMRWB_CODEC || PJMEDIA_HAS_OPENCORE_AMRNB_CODEC || \
+ PJMEDIA_HAS_G7221_CODEC || PJMEDIA_HAS_G722_CODEC || PJMEDIA_HAS_G711_CODEC || \
+ PJMEDIA_HAS_SPEEX_CODEC || PJMEDIA_HAS_ILBC_CODEC || PJMEDIA_HAS_GSM_CODEC
static pjmedia_port* create_stream( pj_pool_t *pool,
const char *codec,
pj_status_t (*codec_init)(pjmedia_endpt*),
@@ -1822,6 +1830,7 @@ static pjmedia_port* create_stream( pj_pool_t *pool,
return port;
}
+#endif
#if PJMEDIA_HAS_G711_CODEC
/* G.711 stream, no SRTP */
--
GitLab