Changeset 263

Timestamp:

Mar 2, 2006 9:12:28 PM (19 years ago)

Author:

bennylp

Message:

Added pj_strdup2_with_null

Location:

pjproject/trunk/pjlib/include/pj

Files:

• string.h (modified) (2 diffs)
• string_i.h (modified) (2 diffs)

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

@@ -216 +216 @@
  * Duplicate string and NULL terminate the destination string.
  *
- * @param pool
- * @param dst
- * @param src
+ * @param pool      The pool.
+ * @param dst       The string result.
+ * @param src       The string to duplicate.
+ *
+ * @return          The string result.
  */
 PJ_IDECL(pj_str_t*) pj_strdup_with_null(pj_pool_t *pool,
@@ -236 +238 @@
                                pj_str_t *dst,
                                const char *src);
+
+/**
+ * Duplicate string and NULL terminate the destination string.
+ *
+ * @param pool      The pool.
+ * @param dst       The string result.
+ * @param src       The string to duplicate.
+ *
+ * @return          The string result.
+ */
+PJ_IDECL(pj_str_t*) pj_strdup2_with_null(pj_pool_t *pool,
+                                         pj_str_t *dst,
+                                         const char *src);
+
 
 /**

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

@@ -44 +44 @@
                                         const pj_str_t *src)
 {
+    dst->ptr = (char*)pj_pool_alloc(pool, src->slen+1);
     if (src->slen) {
-        dst->ptr = (char*)pj_pool_alloc(pool, src->slen+1);
         pj_memcpy(dst->ptr, src->ptr, src->slen);
-    } else {
-        dst->ptr = (char*)pj_pool_alloc(pool, 1);
     }
     dst->slen = src->slen;
@@ -69 +67 @@
 }
 
+PJ_IDEF(pj_str_t*) pj_strdup2_with_null( pj_pool_t *pool,
+                                         pj_str_t *dst,
+                                         const char *src)
+{
+    dst->slen = src ? pj_ansi_strlen(src) : 0;
+    dst->ptr = (char*)pj_pool_alloc(pool, dst->slen+1);
+    if (dst->slen) {
+        pj_memcpy(dst->ptr, src, dst->slen);
+    }
+    dst->ptr[dst->slen] = '\0';
+    return dst;
+}
 
 PJ_IDEF(pj_str_t) pj_strdup3(pj_pool_t *pool, const char *src)