From 04f616d049fada1b3fc43b6e86a50feb0a5fedf5 Mon Sep 17 00:00:00 2001
From: Angel Ortega <angel@triptico.com>
Date: Thu, 3 Feb 2011 09:00:28 +0100
Subject: [PATCH] Changed mpdm_split() and mpdm_split_s().

---
 mpdm.h   |  4 ++--
 mpdm_a.c | 10 +++++-----
 mpdm_h.c |  2 +-
 stress.c | 15 +++++++--------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/mpdm.h b/mpdm.h
index 01c2f30..2693f2d 100644
--- a/mpdm.h
+++ b/mpdm.h
@@ -120,8 +120,8 @@ int mpdm_bseek_s(const mpdm_t a, const wchar_t * k, int step, int *pos);
 mpdm_t mpdm_sort(mpdm_t a, int step);
 mpdm_t mpdm_sort_cb(mpdm_t a, int step, mpdm_t asort_cb);
 
-mpdm_t mpdm_split_s(const wchar_t *s, const mpdm_t v);
-mpdm_t mpdm_split(const mpdm_t s, const mpdm_t a);
+mpdm_t mpdm_split_s(const mpdm_t v, const wchar_t *s);
+mpdm_t mpdm_split(const mpdm_t a, const mpdm_t s);
 mpdm_t mpdm_join_s(const wchar_t *s, const mpdm_t a);
 mpdm_t mpdm_join(const mpdm_t s, const mpdm_t a);
 
diff --git a/mpdm_a.c b/mpdm_a.c
index a4bda3a..737df5a 100644
--- a/mpdm_a.c
+++ b/mpdm_a.c
@@ -629,8 +629,8 @@ mpdm_t mpdm_sort_cb(mpdm_t a, int step, mpdm_t cb)
 
 /**
  * mpdm_split_s - Separates a string into an array of pieces (string version).
- * @s: the separator
  * @v: the value to be separated
+ * @s: the separator
  *
  * Separates the @v string value into an array of pieces, using @s
  * as a separator.
@@ -642,7 +642,7 @@ mpdm_t mpdm_sort_cb(mpdm_t a, int step, mpdm_t cb)
  * [Arrays]
  * [Strings]
  */
-mpdm_t mpdm_split_s(const wchar_t * s, const mpdm_t v)
+mpdm_t mpdm_split_s(const mpdm_t v, const wchar_t *s)
 {
     mpdm_t w = NULL;
     const wchar_t *ptr;
@@ -685,8 +685,8 @@ mpdm_t mpdm_split_s(const wchar_t * s, const mpdm_t v)
 
 /**
  * mpdm_split - Separates a string into an array of pieces.
- * @s: the separator
  * @v: the value to be separated
+ * @s: the separator
  *
  * Separates the @v string value into an array of pieces, using @s
  * as a separator.
@@ -698,7 +698,7 @@ mpdm_t mpdm_split_s(const wchar_t * s, const mpdm_t v)
  * [Arrays]
  * [Strings]
  */
-mpdm_t mpdm_split(const mpdm_t s, const mpdm_t v)
+mpdm_t mpdm_split(const mpdm_t v, const mpdm_t s)
 {
     mpdm_t r;
     wchar_t *ss = NULL;
@@ -708,7 +708,7 @@ mpdm_t mpdm_split(const mpdm_t s, const mpdm_t v)
     if (s != NULL)
         ss = (wchar_t *) s->data;
 
-    r = mpdm_split_s(ss, v);
+    r = mpdm_split_s(v, ss);
 
     mpdm_unref(s);
 
diff --git a/mpdm_h.c b/mpdm_h.c
index ea61736..bb7b28a 100644
--- a/mpdm_h.c
+++ b/mpdm_h.c
@@ -418,7 +418,7 @@ static mpdm_t mpdm_sym(mpdm_t r, mpdm_t k, mpdm_t v, int s)
     if (k->flags & MPDM_MULTIPLE)
         p = mpdm_ref(k);
     else
-        p = mpdm_ref(mpdm_split_s(L".", k));
+        p = mpdm_ref(mpdm_split_s(k, L"."));
 
     w = r;
 
diff --git a/stress.c b/stress.c
index 42ea935..e5a5fc2 100644
--- a/stress.c
+++ b/stress.c
@@ -96,7 +96,7 @@ void test_counter(void)
     v = MPDM_S(L"this is a phrase");
     T(1);
     C;
-    w = mpdm_split_s(L" ", v);
+    w = mpdm_split_s(v, L" ");
     T(5);
 }
 
@@ -589,24 +589,23 @@ void test_split(void)
 
     printf("mpdm_split test\n\n");
 
-    w = mpdm_split(MPDM_S(L"."), MPDM_S(L"four.elems.in.string"));
+    w = mpdm_split(MPDM_S(L"four.elems.in.string"), MPDM_S(L"."));
     mpdm_dump(w);
     do_test("4 elems: ", (w->size == 4));
 
-    w = mpdm_split(MPDM_S(L"."), MPDM_S(L"unseparated string"));
+    w = mpdm_split(MPDM_S(L"unseparated string"), MPDM_S(L"."));
     mpdm_dump(w);
     do_test("1 elem: ", (w->size == 1));
 
-    w = mpdm_split(MPDM_S(L"."), MPDM_S(L".dot.at start"));
+    w = mpdm_split(MPDM_S(L".dot.at start"), MPDM_S(L"."));
     mpdm_dump(w);
     do_test("3 elems: ", (w->size == 3));
 
-    w = mpdm_split(MPDM_S(L"."), MPDM_S(L"dot.at end."));
+    w = mpdm_split(MPDM_S(L"dot.at end."), MPDM_S(L"."));
     mpdm_dump(w);
     do_test("3 elems: ", (w->size == 3));
 
-    w = mpdm_split(MPDM_S(L"."),
-                   MPDM_S(L"three...dots (two empty elements)"));
+    w = mpdm_split(MPDM_S(L"three...dots (two empty elements)"), MPDM_S(L"."));
     mpdm_dump(w);
     do_test("4 elems: ", (w->size == 4));
 
@@ -614,7 +613,7 @@ void test_split(void)
     mpdm_dump(w);
     do_test("2 elems: ", (w->size == 2));
 
-    w = mpdm_split(NULL, MPDM_S(L"I am the man"));
+    w = mpdm_split(MPDM_S(L"I am the man"), NULL);
     do_test("NULL split 1: ", mpdm_size(w) == 12);
     do_test("NULL split 2: ",
             mpdm_cmp(mpdm_aget(w, 0), MPDM_LS(L"I")) == 0);
-- 
2.11.4.GIT