Changeset 5513 for pjproject/branches/projects/uwp/pjsip/include/pjsip/print_util.h

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/include/pjsip/print_util.h (modified) (3 diffs)

pjproject/branches/projects/uwp/pjsip/include/pjsip/print_util.h

@@ -30 +30 @@
         do { \
             if ((str).slen >= (endbuf-buf)) return -1;  \
-            pj_memcpy(buf, (str).ptr, (str).slen); \
-            buf += (str).slen; \
+            if ((str).slen) { \
+                pj_memcpy(buf, (str).ptr, (str).slen); \
+                buf += (str).slen; \
+            } \
         } while (0)
 
@@ -106 +108 @@
 #define copy_advance_pair       copy_advance_pair_check
 
+/*
+ * Append str1 and quoted str2 and copy to buf. 
+ * No string is copied if str2 is empty.
+ */
 #define copy_advance_pair_quote_cond(buf,str1,len1,str2,quotebegin,quoteend) \
         do {    \
@@ -113 +119 @@
             copy_advance_pair(buf,str1,len1,str2); \
         } while (0)
+
+/*
+ * Append str1 and quoted str2 and copy to buf. 
+ * In case str2 is empty, str1 will be appended with empty quote.
+ */
+#define copy_advance_pair_quote_cond_always(buf,str1,len1,str2,quotebegin, \
+                                            quoteend)\
+    do {        \
+       if (!str2.slen) \
+         copy_advance_pair_quote(buf,str1,len1,str2,quotebegin,quoteend); \
+       else \
+         copy_advance_pair_quote_cond(buf,str1,len1,str2,quotebegin,quoteend);\
+    } while (0)
 
 /*