Use parenthesis around assignments in if statements (#123).

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2163 4e78687f-474d-0410-85f9-8d5e500ac6b2

6 files changed, 13 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index fd112c68..87cd3570 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-02-20  Frank Warmerdam  <warmerdam@pobox.com>
 
+	* src/cs2cs.c, src/pj_init.c, src/geod_set.c, src/nad2nad.c, src/geod.c:
+	Use parenthesis around assignments in if statements (#123).
+
 	* src/nad2bin.c: improve io error checking (#140).
 
 	* src/PJ_healpix.c: fix windows build issues (#133)
diff --git a/src/cs2cs.c b/src/cs2cs.c
index 74b44750..2fe7d8a9 100644
--- a/src/cs2cs.c
+++ b/src/cs2cs.c
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
     int from_argc=0, to_argc=0, iargc = argc, eargc = 0, c, mon = 0;
     int have_to_flag = 0, inverse = 0, i;
 
-    if (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR))
+    if ((emess_dat.Prog_name = strrchr(*argv,DIR_CHAR)) != NULL)
         ++emess_dat.Prog_name;
     else emess_dat.Prog_name = *argv;
     inverse = ! strncmp(emess_dat.Prog_name, "inv", 3);
diff --git a/src/geod.c b/src/geod.c
index cbe5a459..87bb0d2e 100644
--- a/src/geod.c
+++ b/src/geod.c
@@ -131,7 +131,7 @@ int main(int argc, char **argv) {
 	FILE *fid;
 	static int eargc = 0, c;
 
-	if (emess_dat.Prog_name = strrchr(*argv,'/')) ++emess_dat.Prog_name;
+	if ((emess_dat.Prog_name = strrchr(*argv,'/')) != NULL) ++emess_dat.Prog_name;
 	else emess_dat.Prog_name = *argv;
 	inverse = ! strncmp(emess_dat.Prog_name, "inv", 3);
 	if (argc <= 1 ) {
diff --git a/src/geod_set.c b/src/geod_set.c
index e43c26c6..141091a9 100644
--- a/src/geod_set.c
+++ b/src/geod_set.c
@@ -23,7 +23,7 @@ geod_set(int argc, char **argv) {
 	/* set elliptical parameters */
 	if (pj_ell_set(pj_get_default_ctx(),start, &geod_a, &es)) emess(1,"ellipse setup failure");
 	/* set units */
-	if (name = pj_param(NULL,start, "sunits").s) {
+	if ((name = pj_param(NULL,start, "sunits").s) != NULL) {
 		char *s;
                 struct PJ_UNITS *unit_list = pj_get_units_ref();
 		for (i = 0; (s = unit_list[i].id) && strcmp(name, s) ; ++i) ;
@@ -32,7 +32,7 @@ geod_set(int argc, char **argv) {
 		fr_meter = 1. / (to_meter = atof(unit_list[i].to_meter));
 	} else
 		to_meter = fr_meter = 1.;
-	if (ellipse = es != 0.) {
+	if ((ellipse = es) != 0.) {
 		onef = sqrt(1. - es);
 		geod_f = 1 - onef;
 		f2 = geod_f/2;
@@ -53,7 +53,7 @@ geod_set(int argc, char **argv) {
 			lam2 = pj_param(NULL,start, "rlon_2").f;
 			geod_inv();
 			geod_pre();
-		} else if (geod_S = pj_param(NULL,start, "dS").f) {
+		} else if ((geod_S = pj_param(NULL,start, "dS").f) != 0.) {
 			al12 = pj_param(NULL,start, "rA").f;
 			geod_pre();
 			geod_for();
@@ -61,7 +61,7 @@ geod_set(int argc, char **argv) {
 		if ((n_alpha = pj_param(NULL,start, "in_A").i) > 0) {
 			if (!(del_alpha = pj_param(NULL,start, "rdel_A").f))
 				emess(1,"del azimuth == 0");
-		} else if (del_S = fabs(pj_param(NULL,start, "ddel_S").f)) {
+		} else if ((del_S = fabs(pj_param(NULL,start, "ddel_S").f)) != 0.) {
 			n_S = geod_S / del_S + .5;
 		} else if ((n_S = pj_param(NULL,start, "in_S").i) <= 0)
 			emess(1,"no interval divisor selected");
diff --git a/src/nad2nad.c b/src/nad2nad.c
index 43a2eccd..06ea2840 100644
--- a/src/nad2nad.c
+++ b/src/nad2nad.c
@@ -108,7 +108,7 @@ set_ops(char *s, struct IO_CON *io) {
 	char *intag;
 	struct TAG_LIST *p;
 
-	for ( ; intag = strtok(s, " ,\t"); s = 0) {
+	for ( ; (intag = strtok(s, " ,\t")) != NULL; s = 0) {
 		for (p = ops_list; p->tag; ++p) {
 			if (!strncmp(intag, p->tag, strlen(p->tag)))
 				break;
@@ -147,7 +147,7 @@ process(FILE *fid) {
 	for (;;) {
 		if (input.bin)
 			fread(&val, sizeof(projUV), 1, fid);
-		else if (s = fgets(line, MAX_LINE, fid)) {
+		else if ((s = fgets(line, MAX_LINE, fid)) != NULL) {
 			if (*s == tag) {
 				fputs(line, stdout);
 				continue;
@@ -228,7 +228,7 @@ int main(int argc, char **argv) {
 	FILE *fid;
 	int eargc = 0, c;
 
-	if (emess_dat.Prog_name = strrchr(*argv,DIR_CHAR))
+	if ((emess_dat.Prog_name = strrchr(*argv,DIR_CHAR)) != NULL)
 		++emess_dat.Prog_name;
 	else emess_dat.Prog_name = *argv;
 	if (argc <= 1 ) {
diff --git a/src/pj_init.c b/src/pj_init.c
index cec7c544..29eb59ba 100644
--- a/src/pj_init.c
+++ b/src/pj_init.c
@@ -470,7 +470,7 @@ pj_init_ctx(projCtx ctx, int argc, char **argv) {
 
     if( strcmp(old_locale,"C") != 0 )
         setlocale(LC_NUMERIC,old_locale);
-    free( old_locale );
+    free( (char*)old_locale );
 
     return PIN;
 }