Changeset 1757

Timestamp:

Jan 26, 2008 10:45:52 AM (16 years ago)

Author:

bennylp

Message:

Added pj_strstr() and pj_stristr() in pjlib

Location:

pjproject/trunk

Files:

• pjlib/include/pj/string.h (modified) (1 diff)
• pjlib/src/pj/string.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_call.c (modified) (1 diff)

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

@@ -473 +473 @@
 
 /**
+ * Find the occurence of a substring substr in string str.
+ *
+ * @param str       The string to search.
+ * @param substr    The string to search fo.
+ *
+ * @return the pointer to the position of substr in str, or NULL. Note
+ *         that if str is not NULL terminated, the returned pointer
+ *         is pointing to non-NULL terminated string.
+ */
+PJ_DECL(char*) pj_strstr(const pj_str_t *str, const pj_str_t *substr);
+
+/**
+ * Performs substring lookup like pj_strstr() but ignores the case of
+ * both strings.
+ *
+ * @param str       The string to search.
+ * @param substr    The string to search fo.
+ *
+ * @return the pointer to the position of substr in str, or NULL. Note
+ *         that if str is not NULL terminated, the returned pointer
+ *         is pointing to non-NULL terminated string.
+ */
+PJ_DECL(char*) pj_stristr(const pj_str_t *str, const pj_str_t *substr);
+
+/**
  * Remove (trim) leading whitespaces from the string.
  *

pjproject/trunk/pjlib/src/pj/string.c

@@ -27 +27 @@
 #  include <pj/string_i.h>
 #endif
+
+
+PJ_DEF(char*) pj_strstr(const pj_str_t *str, const pj_str_t *substr)
+{
+    const char *s, *ends;
+
+    /* Special case when substr is zero */
+    if (substr->slen == 0) {
+        return (char*)str->ptr;
+    }
+
+    s = str->ptr;
+    ends = str->ptr + str->slen - substr->slen;
+    for (; s<=ends; ++s) {
+        if (pj_ansi_strncmp(s, substr->ptr, substr->slen)==0)
+            return (char*)s;
+    }
+    return NULL;
+}
+
+
+PJ_DEF(char*) pj_stristr(const pj_str_t *str, const pj_str_t *substr)
+{
+    const char *s, *ends;
+
+    /* Special case when substr is zero */
+    if (substr->slen == 0) {
+        return (char*)str->ptr;
+    }
+
+    s = str->ptr;
+    ends = str->ptr + str->slen - substr->slen;
+    for (; s<=ends; ++s) {
+        if (pj_ansi_strnicmp(s, substr->ptr, substr->slen)==0)
+            return (char*)s;
+    }
+    return NULL;
+}
 
 

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -254 +254 @@
 
     return PJSUA_INVALID_ID;
-}
-
-static pj_bool_t pj_stristr(const pj_str_t *str, const pj_str_t *substr)
-{
-    int i;
-
-    for (i=0; i<=(str->slen-substr->slen); ++i) {
-        pj_str_t s;
-        s.ptr = str->ptr+i;
-        s.slen = substr->slen;
-
-        if (pj_stricmp(&s, substr)==0)
-            return PJ_TRUE;
-    }
-    return PJ_FALSE;
 }