Changeset 65 for pjproject/trunk/pjlib-util/src/pjlib-util/string.c

Timestamp:

Nov 21, 2005 1:55:47 AM (18 years ago)

Author:

bennylp

Message:

Set svn:eol-style property

File:

• pjproject/trunk/pjlib-util/src/pjlib-util/string.c (modified) (3 diffs, 1 prop)

pjproject/trunk/pjlib-util/src/pjlib-util/string.c

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /* 
  * Copyright (C)2003-2006 Benny Prijono <benny@prijono.org>
@@ -19 +19 @@
 #include <pjlib-util/string.h>
 #include <pj/ctype.h>
+#include <pj/string.h>
+#include <pj/pool.h>
 
-PJ_DEF(void) pj_str_unescape(pj_str_t *str)
+PJ_DEF(pj_str_t) pj_str_unescape( pj_pool_t *pool, const pj_str_t *src_str)
 {
-    char *src = str->ptr;
-    char *dst = str->ptr;
-    char *end = src + str->slen;
+    char *src = src_str->ptr;
+    char *end = src + src_str->slen;
+    pj_str_t dst_str;
+    char *dst;
     
+    if (pj_strchr(src_str, '%')==NULL)
+        return *src_str;
+
+    dst = dst_str.ptr = pj_pool_alloc(pool, src_str->slen);
+
     while (src != end) {
         if (*src == '%' && src < end-2) {
@@ -33 +41 @@
             src += 3;
         } else {
-            ++src;
-            ++dst;
+            *dst++ = *src++;
         }
     }
-    str->slen = dst - str->ptr;
+    dst_str.slen = dst - dst_str.ptr;
+    return dst_str;
 }