MINOR: WURFL: removes heading wurfl-information-separator from wurfl-get-all() and...

diff --git a/src/wurfl.c b/src/wurfl.c
index 0d03efa63c0f82c90493bb783047d77180521aa1..e7256d9b9db38afc24700faeb4c06f7e38ccb724 100644 (file)
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -442,7 +442,6 @@ static int ha_wurfl_get_all(const struct arg *args, struct sample *smp, const ch
        chunk_reset(temp);
 
        list_for_each_entry(wi, &global_wurfl.information_list, list) {
-               chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
 
                switch(wi->data.type) {
                case HA_WURFL_DATA_TYPE_UNKNOWN :
@@ -478,11 +477,20 @@ static int ha_wurfl_get_all(const struct arg *args, struct sample *smp, const ch
                        break;
                }
 
+               // append wurfl-information-list-separator
+               chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
        }
 
        wurfl_device_destroy(dHandle);
        smp->data.u.str.area = temp->area;
        smp->data.u.str.data = temp->data;
+
+       // remove trailing wurfl-information-list-separator
+       if (temp->data) {
+               temp->area[temp->data] = '\0';
+               --smp->data.u.str.data;
+       }
+
        return 1;
 }
 
@@ -508,7 +516,6 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
        chunk_reset(temp);
 
        while (args[i].data.str.area) {
-               chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
                node = ebst_lookup(&global_wurfl.btree, args[i].data.str.area);
 
                if (node) {
@@ -549,6 +556,9 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
                                break;
                        }
 
+                       // append wurfl-information-list-separator
+                       chunk_appendf(temp, "%c", global_wurfl.information_list_separator);
+
                } else {
                        ha_wurfl_log("WURFL: %s not in wurfl-information-list \n",
                                     args[i].data.str.area);
@@ -560,6 +570,13 @@ static int ha_wurfl_get(const struct arg *args, struct sample *smp, const char *
        wurfl_device_destroy(dHandle);
        smp->data.u.str.area = temp->area;
        smp->data.u.str.data = temp->data;
+
+       // remove trailing wurfl-information-list-separator
+       if (temp->data) {
+               temp->area[temp->data] = '\0';
+               --smp->data.u.str.data;
+       }
+
        return 1;
 }