Re #1326:

 - Fixed compile warnings on vs2005
 - Fixed compile error when PJMEDIA_HAS_VIDEO set to 0 on vs2005




git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3666 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 13 insertions, 3 deletions

diff --git a/pjsip-apps/src/pjsua/pjsua_app.c b/pjsip-apps/src/pjsua/pjsua_app.c
index e311c32a..6aa04749 100644
--- a/pjsip-apps/src/pjsua/pjsua_app.c
+++ b/pjsip-apps/src/pjsua/pjsua_app.c
@@ -2653,7 +2653,7 @@ static void on_call_tsx_state(pjsua_call_id call_id,
 
 /* General processing for media state. "mi" is the media index */
 static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
-                                         pj_bool_t *has_error)
+                                        pj_bool_t *has_error)
 {
     const char *status_name[] = {
         "None",
@@ -2663,6 +2663,8 @@ static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
         "Error"
     };
 
+    PJ_UNUSED_ARG(has_error);
+
     pj_assert(ci->media[mi].status <= PJ_ARRAY_SIZE(status_name));
     pj_assert(PJSUA_CALL_MEDIA_ERROR == 4);
 
@@ -2675,6 +2677,8 @@ static void on_call_generic_media_state(pjsua_call_info *ci, unsigned mi,
 static void on_call_audio_state(pjsua_call_info *ci, unsigned mi,
                                 pj_bool_t *has_error)
 {
+    PJ_UNUSED_ARG(has_error);
+
     /* Stop ringback */
     ring_stop(ci->id);
 
@@ -2761,6 +2765,9 @@ static void on_call_audio_state(pjsua_call_info *ci, unsigned mi,
 static void on_call_video_state(pjsua_call_info *ci, unsigned mi,
                                 pj_bool_t *has_error)
 {
+    PJ_UNUSED_ARG(ci);
+    PJ_UNUSED_ARG(mi);
+    PJ_UNUSED_ARG(has_error);
 }
 
 /*
@@ -3149,6 +3156,8 @@ static void on_call_media_event(pjsua_call_id call_id,
                                 pjmedia_event *event)
 {
     char event_name[5];
+    PJ_UNUSED_ARG(call_id);
+    PJ_UNUSED_ARG(med_idx);
     PJ_LOG(4,(THIS_FILE, "Event %s",
 	      pjmedia_fourcc_name(event->type, event_name)));
 }
diff --git a/pjsip-apps/src/samples/simpleua.c b/pjsip-apps/src/samples/simpleua.c
index 2ec49d37..056de017 100644
--- a/pjsip-apps/src/samples/simpleua.c
+++ b/pjsip-apps/src/samples/simpleua.c
@@ -224,7 +224,7 @@ static pjsip_module msg_logger =
  */
 int main(int argc, char *argv[])
 {
-    pj_pool_t *pool;
+    pj_pool_t *pool = NULL;
     pj_status_t status;
     unsigned i;
 
@@ -593,7 +593,8 @@ int main(int argc, char *argv[])
 	pjsip_endpt_destroy(g_endpt);
 
     /* Release pool */
-    pj_pool_release(pool);
+    if (pool)
+	pj_pool_release(pool);
 
     return 0;
 }