From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Mon, 8 Oct 2018 23:20:45 +0000 (-0500)
Subject: Let xcsv parser keep QStrings up for one more level.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~84^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=210ae091736c5512ec5738a38bfce12b7b00d7d8;p=gpsbabel.git

Let xcsv parser keep QStrings up for one more level.
---

diff --git a/xcsv.cc b/xcsv.cc
index ee147a927..d93aec206 100644
--- a/xcsv.cc
+++ b/xcsv.cc
@@ -413,16 +413,13 @@ xcsv_parse_style_buff(const char* sbuff)
 static void
 xcsv_read_style(const char* fname)
 {
-  char* sbuff;
-
   xcsv_file_init();
 
   gbfile* fp = gbfopen(fname, "rb", MYNAME);
-  while ((sbuff = gbfgetstr(fp))) {
-    sbuff = lrtrim(sbuff);
+  for  (QString sbuff = gbfgetstr(fp); !sbuff.isNull(); sbuff = gbfgetstr(fp)) {
+    sbuff = sbuff.trimmed();
     xcsv_parse_style_line(sbuff);
   }
-  while (!gbfeof(fp));
 
   /* if we have no output fields, use input fields as output fields */
   if (xcsv_file.ofield_ct == 0) {