diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2019-10-28 09:03:10 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2019-10-28 09:03:10 +0100 |
| commit | 4330f9fa4391b4d39c52c972c75327ed2ba6ce33 (patch) | |
| tree | d2718cc258d02faee018c96602f84c814cba5fce /src/apps | |
| parent | e2d5b13f3442a8e88093a9d68e1be550194a4d77 (diff) | |
| download | PROJ-4330f9fa4391b4d39c52c972c75327ed2ba6ce33.tar.gz PROJ-4330f9fa4391b4d39c52c972c75327ed2ba6ce33.zip | |
Various fixes/workarounds to make cppcheck 1.72 (Ubuntu 16.04) and HEAD/1.90dev happy (fixes #1648)
Diffstat (limited to 'src/apps')
| -rw-r--r-- | src/apps/gie.cpp | 4 | ||||
| -rw-r--r-- | src/apps/optargpm.h | 4 | ||||
| -rw-r--r-- | src/apps/proj.cpp | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/apps/gie.cpp b/src/apps/gie.cpp index 4ae97130..6a67b55d 100644 --- a/src/apps/gie.cpp +++ b/src/apps/gie.cpp @@ -874,7 +874,7 @@ static int expect_failure_with_errno_message (int expected, int got) { /* For test purposes, we want to call a transformation of the same */ /* dimensionality as the number of dimensions given in accept */ -static PJ_COORD expect_trans_n_dim (PJ_COORD ci) { +static PJ_COORD expect_trans_n_dim (const PJ_COORD& ci) { if (4==T.dimensions_given_at_last_accept) return proj_trans (T.P, T.dir, ci); @@ -1192,7 +1192,7 @@ static int errno_from_err_const (const char *err_const) { const size_t n = sizeof lookup / sizeof lookup[0]; size_t i, len; int ret; - char tolower_err_const[100]; + char tolower_err_const[100] = {}; /* Make a lower case copy for matching */ for (i = 0; i < 99; i++) { diff --git a/src/apps/optargpm.h b/src/apps/optargpm.h index f293ad98..4e8dd9c7 100644 --- a/src/apps/optargpm.h +++ b/src/apps/optargpm.h @@ -286,9 +286,7 @@ int opt_input_loop (OPTARGS *opt, int binary) { return 1; /* ignore non-existing files - go on! */ - if (nullptr==opt->input) - return opt_input_loop (opt, binary); - return 0; + return opt_input_loop (opt, binary); } diff --git a/src/apps/proj.cpp b/src/apps/proj.cpp index 888d723f..7fe08023 100644 --- a/src/apps/proj.cpp +++ b/src/apps/proj.cpp @@ -290,7 +290,8 @@ static void vprocess(FILE *fid) { } int main(int argc, char **argv) { - char *arg, *pargv[MAX_PARGS]; + char *arg; + char *pargv[MAX_PARGS] = {}; char **eargv = argv; FILE *fid; int pargc = 0, eargc = 0, mon = 0; |
