From 66e04bf4e5cdb27a44e9bea6bacad22c02df2f0d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Sun, 26 Feb 2017 00:22:03 +0100
Subject: Fix warnings related to -Wshadow -Wnull-dereference
 -Wfloat-conversionr -Wmissing-prototypes -Wmissing-declarations

---
 src/proj.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/proj.c')

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;
-- 
cgit v1.2.3