commit e9fedf560a84acab6571f628309edafe3a712903
author mbellomi <massimiliano@scientiamobile.com> Tue May 21 16:29:22 2019 +0200
committer Willy Tarreau <w@1wt.eu> Wed May 22 12:06:38 2019 +0200
tree 82fabdf565daab24890803d056dd91541577486f
parent 4304e30af1fec9d6ab1c5ea92f0266ad673f064d

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

src/wurfl.c

diff --git a/src/wurfl.c b/src/wurfl.c
index 0d03efa..e7256d9 100644
--- a/src/wurfl.c
+++ b/src/wurfl.c
@@ -442,7 +442,6 @@
 	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 @@
 			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 @@
 	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 @@
 				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 @@
 	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;
 }