aboutsummaryrefslogtreecommitdiff
path: root/src/proj.c
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2017-02-26 00:22:03 +0100
committerEven Rouault <even.rouault@spatialys.com>2017-02-26 11:25:14 +0100
commit66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d (patch)
treef148438285557a491088b4042a1dfab80f80d577 /src/proj.c
parentb288ee6bbc345baf2ef56aaec49184c34a6cd0dd (diff)
downloadPROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.tar.gz
PROJ-66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d.zip
Fix warnings related to -Wshadow -Wnull-dereference -Wfloat-conversionr -Wmissing-prototypes -Wmissing-declarations
Diffstat (limited to 'src/proj.c')
-rw-r--r--src/proj.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/proj.c b/src/proj.c
index 2a6cc6ef..10eb0f8d 100644
--- a/src/proj.c
+++ b/src/proj.c
@@ -247,7 +247,7 @@ vprocess(FILE *fid) {
int main(int argc, char **argv) {
char *arg, **eargv = argv, *pargv[MAX_PARGS], **iargv = argv;
FILE *fid;
- int pargc = 0, iargc = argc, eargc = 0, c, mon = 0;
+ int pargc = 0, iargc = argc, eargc = 0, mon = 0;
if ( (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR)) != NULL)
++emess_dat.Prog_name;
@@ -381,12 +381,15 @@ int main(int argc, char **argv) {
continue;
case 'W': /* specify seconds precision */
case 'w': /* -W for constant field width */
- if ((c = arg[1]) != 0 && isdigit(c)) {
+ {
+ int c = arg[1];
+ if (c != 0 && isdigit(c)) {
set_rtodms(c - '0', *arg == 'W');
++arg;
} else
emess(1,"-W argument missing or non-digit");
continue;
+ }
case 'f': /* alternate output format degrees or xy */
if (--argc <= 0) goto noargument;
oform = *++argv;