Changeset 3443 for pjproject

Timestamp:

Mar 15, 2011 5:09:29 AM (14 years ago)

Author:

ming

Message:

Misc (re #1175) (thanks to Seth Hinze for the patch):

• uri_test: Fixes a divide by zero error when the benchmark is run on a really fast machine.
• presence: Fixes a compiler warning about potential referencing of an uninitialized variable.
• echo_speex: Allow for compilation when PJMEDIA_HAS_SPEEX_AEC is not defined.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/echo_speex.c (modified) (2 diffs)
• pjsip/src/pjsip-simple/presence.c (modified) (1 diff)
• pjsip/src/test/uri_test.c (modified) (3 diffs)

pjproject/trunk/pjmedia/src/pjmedia/echo_speex.c

@@ -24 +24 @@
 #include <pj/log.h>
 #include <pj/pool.h>
+
+#if defined(PJMEDIA_HAS_SPEEX_AEC) && PJMEDIA_HAS_SPEEX_AEC != 0
+
 #include <speex/speex_echo.h>
 #include <speex/speex_preprocess.h>
@@ -186 +189 @@
 }
 
+#endif

pjproject/trunk/pjsip/src/pjsip-simple/presence.c

@@ -702 +702 @@
     const pj_str_t STR_MULTIPART = { "multipart", 9 };
     pjsip_ctype_hdr *ctype_hdr;
-    pj_status_t status;
+    pj_status_t status = PJ_SUCCESS;
 
     *p_st_text = NULL;

pjproject/trunk/pjsip/src/test/uri_test.c

@@ -953 +953 @@
     pj_highprec_mul(avg_parse, AVERAGE_URL_LEN);
     pj_highprec_div(avg_parse, var.parse_len);
+    if (avg_parse == 0)
+        avg_parse = 1;
     avg_parse = 1000000 / avg_parse;
 
@@ -970 +972 @@
     pj_highprec_mul(avg_print, AVERAGE_URL_LEN);
     pj_highprec_div(avg_print, var.parse_len);
+    if (avg_print == 0)
+        avg_print = 1;
     avg_print = 1000000 / avg_print;
 
@@ -987 +991 @@
     pj_highprec_mul(avg_cmp, AVERAGE_URL_LEN);
     pj_highprec_div(avg_cmp, var.cmp_len);
+    if (avg_cmp == 0)
+        avg_cmp = 1;
     avg_cmp = 1000000 / avg_cmp;