Changeset 2103 for pjproject/trunk

Timestamp:

Jul 4, 2008 11:49:44 PM (16 years ago)

Author:

bennylp

Message:

Fixed compilation warnings on gcc-4.2.3

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/mix.c (modified) (3 diffs)
• pjsip/include/pjsip/sip_uri.h (modified) (1 diff)
• pjsip/src/pjsip/sip_util.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/samples/mix.c

@@ -70 +70 @@
     PJ_LOG(3,(THIS_FILE, "%s error: %s", title, errmsg));
     return 1;
+}
+
+static void usage(void)
+{
+    puts(desc);
 }
 
@@ -101 +106 @@
             if (clock_rate < 1000) {
                 puts("Error: invalid clock rate");
+                usage();
                 return -1;
             }
@@ -113 +119 @@
     if (pj_optind == argc) {
         puts("Error: no WAV output is specified");
+        usage();
         return 1;
     }

pjproject/trunk/pjsip/include/pjsip/sip_uri.h

@@ -256 +256 @@
  * @return          the URI.
  */
-PJ_INLINE(void*) pjsip_uri_get_uri(void *uri)
-{
-    return (*((pjsip_uri*)uri)->vptr->p_get_uri)(uri);
+PJ_INLINE(void*) pjsip_uri_get_uri(const void *uri)
+{
+    return (*((pjsip_uri*)uri)->vptr->p_get_uri)((void*)uri);
 }
 

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -763 +763 @@
         {
             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 {