diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-07-04 23:49:44 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-07-04 23:49:44 +0000 |
| commit | 506ed7d5bf6ab7f084047014bd49a58da041942f (patch) | |
| tree | 7d80fba0300ab903c3a80e7f4058aa8c158433a4 | |
| parent | ea62efc24ccf3a383d138b8088a454ee66b86a4f (diff) | |
Fixed compilation warnings on gcc-4.2.3
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2103 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/samples/mix.c | 7 | ||||
| -rw-r--r-- | pjsip/include/pjsip/sip_uri.h | 4 | ||||
| -rw-r--r-- | pjsip/src/pjsip/sip_util.c | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/pjsip-apps/src/samples/mix.c b/pjsip-apps/src/samples/mix.c index 5be5b448..f10ab487 100644 --- a/pjsip-apps/src/samples/mix.c +++ b/pjsip-apps/src/samples/mix.c @@ -71,6 +71,11 @@ static int err_ret(const char *title, pj_status_t status) return 1; } +static void usage(void) +{ + puts(desc); +} + int main(int argc, char *argv[]) { pj_caching_pool cp; @@ -100,6 +105,7 @@ int main(int argc, char *argv[]) clock_rate = atoi(pj_optarg); if (clock_rate < 1000) { puts("Error: invalid clock rate"); + usage(); return -1; } break; @@ -112,6 +118,7 @@ int main(int argc, char *argv[]) /* Get output WAV name */ if (pj_optind == argc) { puts("Error: no WAV output is specified"); + usage(); return 1; } diff --git a/pjsip/include/pjsip/sip_uri.h b/pjsip/include/pjsip/sip_uri.h index 53a33f6d..5f5ea7e1 100644 --- a/pjsip/include/pjsip/sip_uri.h +++ b/pjsip/include/pjsip/sip_uri.h @@ -255,9 +255,9 @@ PJ_INLINE(const pj_str_t*) pjsip_uri_get_scheme(const void *uri) * @param uri the URI. * @return the URI. */ -PJ_INLINE(void*) pjsip_uri_get_uri(void *uri) +PJ_INLINE(void*) pjsip_uri_get_uri(const void *uri) { - return (*((pjsip_uri*)uri)->vptr->p_get_uri)(uri); + return (*((pjsip_uri*)uri)->vptr->p_get_uri)((void*)uri); } /** diff --git a/pjsip/src/pjsip/sip_util.c b/pjsip/src/pjsip/sip_util.c index eaff8103..f059d20e 100644 --- a/pjsip/src/pjsip/sip_util.c +++ b/pjsip/src/pjsip/sip_util.c @@ -762,7 +762,7 @@ PJ_DEF(pj_status_t) pjsip_process_route_set(pjsip_tx_data *tdata, PJSIP_URI_SCHEME_IS_SIPS(topmost_route_uri)) { const pjsip_sip_uri *url = (const pjsip_sip_uri*) - pjsip_uri_get_uri((void*)topmost_route_uri); + pjsip_uri_get_uri((const void*)topmost_route_uri); has_lr_param = url->lr_param; } else { has_lr_param = 0; |