Changeset 5513 for pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_msg.c

Timestamp:

Dec 28, 2016 3:40:07 AM (8 years ago)

Author:

nanang

Message:

Re #1900: More merged from trunk (r5512 mistakenly contains merged changes in third-party dir only).

Location:

pjproject/branches/projects/uwp

Files:

• . (modified) (1 prop)
• pjsip/src/pjsip/sip_msg.c (modified) (2 diffs)

pjproject/branches/projects/uwp/pjsip/src/pjsip/sip_msg.c

@@ -252 +252 @@
     unsigned i;
     for (i=0; i<PJ_ARRAY_SIZE(method_names); ++i) {
-        if (pj_memcmp(str->ptr, method_names[i]->ptr, str->slen)==0 || 
+        if (pj_memcmp(str, method_names[i], sizeof(pj_str_t))==0 || 
             pj_stricmp(str, method_names[i])==0) 
         {
@@ -2014 +2014 @@
 
     /* Check if host contains IPv6 */
-    if (pj_memchr(hdr->sent_by.host.ptr, ':', hdr->sent_by.host.slen)) {
+    if (pj_strchr(&hdr->sent_by.host, ':')) {
         copy_advance_pair_quote_cond(buf, "", 0, hdr->sent_by.host, '[', ']');
     } else {