Changeset 180 for pjproject/trunk

Timestamp:

Feb 14, 2006 8:59:53 PM (19 years ago)

Author:

bennylp

Message:

Added pj_strcat2

Location:

pjproject/trunk/pjlib/include/pj

Files:

• string.h (modified) (1 diff)
• string_i.h (modified) (11 diffs)

pjproject/trunk/pjlib/include/pj/string.h

@@ -427 +427 @@
 PJ_IDECL(void) pj_strcat(pj_str_t *dst, const pj_str_t *src);
 
+
+/**
+ * Concatenate strings.
+ *
+ * @param dst       The destination string.
+ * @param src       The source string.
+ */
+PJ_IDECL(void) pj_strcat2(pj_str_t *dst, const char *str);
+
+
 /**
  * Finds a character in a string.

pjproject/trunk/pjlib/include/pj/string_i.h

@@ -24 +24 @@
     pj_str_t dst;
     dst.ptr = str;
-    dst.slen = str ? pj_native_strlen(str) : 0;
+    dst.slen = str ? pj_ansi_strlen(str) : 0;
     return dst;
 }
@@ -59 +59 @@
                               const char *src)
 {
-    dst->slen = src ? pj_native_strlen(src) : 0;
+    dst->slen = src ? pj_ansi_strlen(src) : 0;
     if (dst->slen) {
         dst->ptr = (char*)pj_pool_alloc(pool, dst->slen);
@@ -94 +94 @@
 PJ_IDEF(pj_str_t*) pj_strcpy2(pj_str_t *dst, const char *src)
 {
-    dst->slen = src ? pj_native_strlen(src) : 0;
+    dst->slen = src ? pj_ansi_strlen(src) : 0;
     if (dst->slen > 0)
         pj_memcpy(dst->ptr, src, dst->slen);
@@ -132 +132 @@
         return diff > 0 ? 1 : -1;
     } else if (str1->ptr && str1->slen) {
-        return pj_native_strncmp(str1->ptr, str2->ptr, str1->slen);
+        return pj_ansi_strncmp(str1->ptr, str2->ptr, str1->slen);
     } else {
         return 0;
@@ -142 +142 @@
 {
     if (str1->ptr && str2->ptr)
-        return pj_native_strncmp(str1->ptr, str2->ptr, len);
+        return pj_ansi_strncmp(str1->ptr, str2->ptr, len);
     else if (str2->ptr)
         return str2->slen==0 ? 0 : -1;
@@ -157 +157 @@
         return 0;
     else if (str1->ptr && str2)
-        return pj_native_strncmp(str1->ptr, str2, len);
+        return pj_ansi_strncmp(str1->ptr, str2, len);
     else if (str1->ptr)
         return str1->slen==0 ? 0 : 1;
@@ -182 +182 @@
         return 0;
     } else {
-        return pj_native_strnicmp(str1->ptr, str2->ptr, len);
+        return pj_ansi_strnicmp(str1->ptr, str2->ptr, len);
     }
 }
@@ -258 +258 @@
 {
     if (str1->ptr && str2)
-        return pj_native_strnicmp(str1->ptr, str2, str1->slen);
+        return pj_ansi_strnicmp(str1->ptr, str2, str1->slen);
     else if (str2)
         return (*str2=='\0') ? 0 : -1;
@@ -271 +271 @@
 {
     if (str1->ptr && str2->ptr)
-        return pj_native_strnicmp(str1->ptr, str2->ptr, len);
+        return pj_ansi_strnicmp(str1->ptr, str2->ptr, len);
     else if (str2->ptr)
         return str2->slen==0 ? 0 : -1;
@@ -286 +286 @@
         return 0;
     else if (str1->ptr && str2)
-        return pj_native_strnicmp(str1->ptr, str2, len);
+        return pj_ansi_strnicmp(str1->ptr, str2, len);
     else if (str1->ptr)
         return str1->slen==0 ? 0 : 1;
@@ -304 +304 @@
 }
 
+PJ_IDEF(void) pj_strcat2(pj_str_t *dst, const char *str)
+{
+    unsigned len = pj_ansi_strlen(str);
+    if (len) {
+        pj_memcpy(dst->ptr + dst->slen, str, len);
+        dst->slen += len;
+    }
+}
+
 PJ_IDEF(pj_str_t*) pj_strtrim( pj_str_t *str )
 {