Changeset 62 for pjproject/trunk/pjlib/include/pj/string_i.h

Timestamp:

Nov 20, 2005 7:55:42 PM (17 years ago)

Author:

bennylp

Message:

Added hex character conversion utility in ctype

File:

• pjproject/trunk/pjlib/include/pj/string_i.h (modified) (10 diffs)

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

@@ -22 +22 @@
     pj_str_t dst;
     dst.ptr = str;
-    dst.slen = str ? strlen(str) : 0;
+    dst.slen = str ? pj_native_strlen(str) : 0;
     return dst;
 }
@@ -57 +57 @@
                               const char *src)
 {
-    dst->slen = src ? strlen(src) : 0;
+    dst->slen = src ? pj_native_strlen(src) : 0;
     if (dst->slen) {
         dst->ptr = (char*)pj_pool_alloc(pool, dst->slen);
@@ -92 +92 @@
 PJ_IDEF(pj_str_t*) pj_strcpy2(pj_str_t *dst, const char *src)
 {
-    dst->slen = src ? strlen(src) : 0;
+    dst->slen = src ? pj_native_strlen(src) : 0;
     if (dst->slen > 0)
         pj_memcpy(dst->ptr, src, dst->slen);
     return dst;
 }
+
+PJ_IDEF(pj_str_t*) pj_strncpy( pj_str_t *dst, const pj_str_t *src, 
+                               pj_ssize_t max)
+{
+    if (max > src->slen) max = src->slen;
+    pj_memcpy(dst->ptr, src->ptr, max);
+    dst->slen = max;
+    return dst;
+}
+
+PJ_IDEF(pj_str_t*) pj_strncpy_with_null( pj_str_t *dst, const pj_str_t *src,
+                                         pj_ssize_t max)
+{
+    if (max <= src->slen)
+        max = max-1;
+    else
+        max = src->slen;
+
+    pj_memcpy(dst->ptr, src->ptr, max);
+    dst->ptr[max] = '\0';
+    dst->slen = max;
+    return dst;
+}
+
 
 PJ_IDEF(int) pj_strcmp( const pj_str_t *str1, const pj_str_t *str2)
@@ -105 +129 @@
     if (diff) {
         return (int)diff;
-    } else if (str1->ptr) {
-        return strncmp(str1->ptr, str2->ptr, str1->slen);
+    } else if (str1->ptr && str1->slen) {
+        return pj_native_strncmp(str1->ptr, str2->ptr, str1->slen);
     } else {
         return 0;
@@ -115 +139 @@
                          pj_size_t len)
 {
-    return (str1->ptr && str2->ptr) ? strncmp(str1->ptr, str2->ptr, len) :
-           (str1->ptr == str2->ptr ? 0 : 1);
+    return (str1->ptr && str2->ptr) ? 
+            pj_native_strncmp(str1->ptr, str2->ptr, len) :
+            (str1->ptr == str2->ptr ? 0 : 1);
 }
 
@@ -122 +147 @@
                           pj_size_t len)
 {
-    return (str1->ptr && str2) ? strncmp(str1->ptr, str2, len) :
+    return (str1->ptr && str2) ? pj_native_strncmp(str1->ptr, str2, len) :
            (str1->ptr==str2 ? 0 : 1);
 }
@@ -139 +164 @@
         return (int)diff;
     } else {
-        return strnicmp(str1->ptr, str2->ptr, str1->slen);
+        return pj_native_strnicmp(str1->ptr, str2->ptr, str1->slen);
     }
 }
@@ -145 +170 @@
 PJ_IDEF(int) pj_stricmp2( const pj_str_t *str1, const char *str2)
 {
-    return (str1->ptr && str2) ? strnicmp(str1->ptr, str2, str1->slen) :
-           (str1->ptr==str2 ? 0 : 1);
+    return (str1->ptr && str2) ? 
+            pj_native_strnicmp(str1->ptr, str2, str1->slen) :
+            (str1->ptr==str2 ? 0 : 1);
 }
 
@@ -152 +178 @@
                           pj_size_t len)
 {
-    return (str1->ptr && str2->ptr) ? strnicmp(str1->ptr, str2->ptr, len) :
-           (str1->ptr == str2->ptr ? 0 : 1);
+    return (str1->ptr && str2->ptr) ? 
+            pj_native_strnicmp(str1->ptr, str2->ptr, len) :
+            (str1->ptr == str2->ptr ? 0 : 1);
 }
 
@@ -159 +186 @@
                            pj_size_t len)
 {
-    return (str1->ptr && str2) ? strnicmp(str1->ptr, str2, len) :
-           (str1->ptr == str2 ? 0 : 1);
+    return (str1->ptr && str2) ? 
+            pj_native_strnicmp(str1->ptr, str2, len) :
+            (str1->ptr == str2 ? 0 : 1);
 }