From: robertlipe Date: Sat, 9 Feb 2013 19:38:10 +0000 (+0000) Subject: More const-ipation changes in vecs.cc X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~11^2~666 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9333174b7107c05de7640f16fb4a549e910717ba;p=gpsbabel.git More const-ipation changes in vecs.cc --- diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc index 176c8f33b..1a066c0ad 100644 --- a/gpsbabel/vecs.cc +++ b/gpsbabel/vecs.cc @@ -1240,15 +1240,12 @@ find_vec(const char *vecname, char **opts) } while (vec->vec) { - arglist_t *ap; - char *res; - if (case_ignore_strcmp(svecname, vec->name)) { vec++; continue; } - res = strchr(vecname, ','); + const char* res = strchr(vecname, ','); if (res) { *opts = strchr(vecname, ',')+1; } else { @@ -1256,7 +1253,7 @@ find_vec(const char *vecname, char **opts) } if (vec->vec->args) { - for (ap = vec->vec->args; ap->argstring; ap++) { + for (arglist_t* ap = vec->vec->args; ap->argstring; ap++) { const char *opt; if (res) { @@ -1300,15 +1297,12 @@ find_vec(const char *vecname, char **opts) * is to search the list of xcsv styles. */ while (svec->name) { - arglist_t *ap; - char *res; - if (case_ignore_strcmp(svecname, svec->name)) { svec++; continue; } - res = strchr(vecname, ','); + const char* res = strchr(vecname, ','); if (res) { *opts = strchr(vecname, ',') + 1; } else { @@ -1316,7 +1310,7 @@ find_vec(const char *vecname, char **opts) } if (vec_list[0].vec->args) { - for (ap = vec_list[0].vec->args; ap->argstring; ap++) { + for (arglist_t* ap = vec_list[0].vec->args; ap->argstring; ap++) { const char *opt; if (res) {