[PATCH] Remove trailing spaces from the produced output

Anton Lundin glance at acc.umu.se
Tue May 6 23:47:41 PDT 2014


The code found the trailing spaces and just didn't care about it.

This also removes the FIXME quoting, because quoting is managed.

Signed-off-by: Anton Lundin <glance at acc.umu.se>
---
 save-xml.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/save-xml.c b/save-xml.c
index b582fcf..3292cf0 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -71,6 +71,7 @@ static void quote(struct membuffer *b, const char *text, int is_attribute)
 static void show_utf8(struct membuffer *b, const char *text, const char *pre, const char *post, int is_attribute)
 {
 	int len;
+	char *cleaned;
 
 	if (!text)
 		return;
@@ -81,10 +82,11 @@ static void show_utf8(struct membuffer *b, const char *text, const char *pre, co
 		return;
 	while (len && isspace(text[len - 1]))
 		len--;
-	/* FIXME! Quoting! */
+	cleaned = strndup(text, len);
 	put_string(b, pre);
-	quote(b, text, is_attribute);
+	quote(b, cleaned, is_attribute);
 	put_string(b, post);
+	free(cleaned);
 }
 
 static void save_depths(struct membuffer *b, struct divecomputer *dc)
-- 
1.9.1



More information about the subsurface mailing list