From: Robert Lipe <robertlipe@users.noreply.github.com>
Date: Mon, 30 Jul 2018 06:09:39 +0000 (-0500)
Subject: Merge branch 'master' into cleanups
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~8^2~86^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e36f9ff1af1497b8c28236f856312f30b76702c;p=gpsbabel.git

Merge branch 'master' into cleanups
---

0e36f9ff1af1497b8c28236f856312f30b76702c
diff --cc vecs.cc
index 0f5fb864e,4c4a947f5..f04bfd74d
--- a/vecs.cc
+++ b/vecs.cc
@@@ -1547,8 -1539,8 +1539,8 @@@ disp_vecs(
      if (svp[i]->vec->type == ff_type_internal)  {
        continue;
      }
 -    printf(VEC_FMT, svp[i]->name, svp[i]->desc);
 +    printf(VEC_FMT, svp[i]->name, CSTR(svp[i]->desc));
-     for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
+     for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
        if (!(ap->argtype & ARGTYPE_HIDDEN))
          printf("	  %-18.18s    %s%-.50s %s\n",
                 ap->argstring,
@@@ -1575,8 -1564,8 +1564,9 @@@ disp_vec(const char* vecname
      if (case_ignore_strcmp(svp[i]->name, vecname))  {
        continue;
      }
 -    printf(VEC_FMT, svp[i]->name, svp[i]->desc);
++
 +    printf(VEC_FMT, svp[i]->name, CSTR(svp[i]->desc));
-     for (ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
+     for (auto ap = svp[i]->vec->args; ap && ap->argstring; ap++) {
        if (!(ap->argtype & ARGTYPE_HIDDEN))
          printf("	  %-18.18s    %s%-.50s %s\n",
                 ap->argstring,