Changeset 2122

Timestamp:

04/15/08 10:00:43 (1 month ago)

Author:

karpet

Message:

add stringlist utility functions; still TODO is to make StringList? utf-8 safe

Files:

• libswish3/trunk/src/libswish3/string.c (modified) (3 diffs)

libswish3/trunk/src/libswish3/string.c

@@ -509 +509 @@
-    sl->n = 0;
-    sl->word = swish_xmalloc(2 * sizeof(xmlChar *));
-
-
-
+
-    return sl;
-}
@@ -525 +523 @@
-    swish_xfree(sl->word);
-    swish_xfree(sl);
+}
+
+void
+swish_merge_stringlists(
+    swish_StringList *sl1,
+    swish_StringList *sl2
+)
+{
+    int i;
+    // add sl1 -> sl2
+    sl2->word = (xmlChar **)swish_xrealloc(sl2->word, (sl1->n + sl2->n) * sizeof(xmlChar *) + 1);
+    for(i=0; i<sl1->n; i++) {
+        // copy is a little overhead, but keeps mem count simple
+        sl2->word[sl2->n++] = swish_xstrdup( sl1->word[i] );
+    }
+    swish_free_stringlist(sl1);
+}
+
+swish_StringList *
+swish_copy_stringlist(
+    swish_StringList *sl
+)
+{
+    swish_StringList *s2;
+    int i;
+    s2 = swish_init_stringlist();
+    s2->word = (xmlChar **)swish_xrealloc(s2->word, sl->n * sizeof(xmlChar *) + 1);
+    for(i=0; i<sl->n; i++) {
+        s2->word[i] = swish_xstrdup( sl->word[i] );
+    }
+    s2->n = sl->n;
+    return s2;
-}
-
@@ -550 +580 @@
-
-    while (&line && (p = getword(&line))) {
-
-
+
-        if (!*p) {
-            swish_xfree(p);