diff options
Diffstat (limited to 'src/nad2bin.c')
| -rw-r--r-- | src/nad2bin.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nad2bin.c b/src/nad2bin.c index 03a55326..dfc4e2dd 100644 --- a/src/nad2bin.c +++ b/src/nad2bin.c @@ -77,7 +77,7 @@ int main(int argc, char **argv) { /* ==================================================================== */ for( i = 1; i < argc; i++ ) { - if( strcmp(argv[i],"-f") == 0 && i < argc-1 ) + if( i < argc-1 && strcmp(argv[i],"-f") == 0 ) { format = argv[++i]; } @@ -103,6 +103,7 @@ int main(int argc, char **argv) { perror("fgets"); exit(1); } + /* cppcheck-suppress invalidscanf */ if ( EOF == scanf("%d %d %*d %lf %lf %lf %lf", &ct.lim.lam, &ct.lim.phi, &ct.ll.lam, &ct.del.lam, &ct.ll.phi, &ct.del.phi) ) { perror("scanf"); @@ -119,6 +120,7 @@ int main(int argc, char **argv) { ct.del.phi *= DEG_TO_RAD; /* load table */ for (p = ct.cvs, i = 0; i < ct.lim.phi; ++i) { + /* cppcheck-suppress invalidscanf */ if ( EOF == scanf("%d:%ld %ld", &ichk, &laml, &phil) ) { perror("scanf on row"); exit(1); @@ -131,6 +133,7 @@ int main(int argc, char **argv) { t.phi = (float) (phil * U_SEC_TO_RAD); *p++ = t; for (j = 1; j < ct.lim.lam; ++j) { + /* cppcheck-suppress invalidscanf */ if ( EOF == scanf("%ld %ld", &lam, &phi) ) { perror("scanf on column"); exit(1); @@ -177,7 +180,9 @@ int main(int argc, char **argv) { exit(2); } + /* cppcheck-suppress sizeofCalculation */ STATIC_ASSERT( MAX_TAB_ID == 80 ); + /* cppcheck-suppress sizeofCalculation */ STATIC_ASSERT( sizeof(pj_int32) == 4 ); /* for ct.lim.lam/phi */ memset( header, 0, sizeof(header) ); @@ -273,6 +278,7 @@ int main(int argc, char **argv) { ur.lam = ct.ll.lam + (ct.lim.lam-1) * ct.del.lam; ur.phi = ct.ll.phi + (ct.lim.phi-1) * ct.del.phi; + /* cppcheck-suppress sizeofCalculation */ STATIC_ASSERT( sizeof(nGSCount) == 4 ); memset( achHeader, 0, sizeof(achHeader) ); |