diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2010-03-03 05:44:20 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2010-03-03 05:44:20 +0000 |
| commit | aa00a53a0f27b033eeb0eeca1924cdc0a9ca4dc0 (patch) | |
| tree | 990adaa1749afef0ec06647d89e5f59542dafadc /src/pj_init.c | |
| parent | 3405bf76e70d12df6b9dc0c9c129c7dc96918e8d (diff) | |
| download | PROJ-aa00a53a0f27b033eeb0eeca1924cdc0a9ca4dc0.tar.gz PROJ-aa00a53a0f27b033eeb0eeca1924cdc0a9ca4dc0.zip | |
avoid warnings
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1827 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_init.c')
| -rw-r--r-- | src/pj_init.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index eb8cf268..9f336073 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -89,7 +89,7 @@ static paralist * get_defaults(paralist **start, paralist *next, char *name) { FILE *fid; - if (fid = pj_open_lib("proj_def.dat", "rt")) { + if ( (fid = pj_open_lib("proj_def.dat", "rt")) != NULL) { next = get_opt(start, fid, "general", next); rewind(fid); next = get_opt(start, fid, name, next); @@ -128,10 +128,10 @@ get_init(paralist **start, paralist *next, char *name) { /* ** Otherwise we try to open the file and search for it. */ - if (opt = strrchr(fname, ':')) + if ((opt = strrchr(fname, ':')) != NULL) *opt++ = '\0'; else { pj_errno = -3; return(0); } - if (fid = pj_open_lib(fname, "rt")) + if ( (fid = pj_open_lib(fname, "rt")) != NULL) next = get_opt(start, fid, opt, next); else return(0); @@ -360,7 +360,7 @@ pj_init(int argc, char **argv) { /* set units */ s = 0; - if (name = pj_param(start, "sunits").s) { + if ((name = pj_param(start, "sunits").s) != NULL) { for (i = 0; (s = pj_units[i].id) && strcmp(name, s) ; ++i) ; if (!s) { pj_errno = -7; goto bum_call; } s = pj_units[i].to_meter; @@ -375,7 +375,7 @@ pj_init(int argc, char **argv) { /* prime meridian */ s = 0; - if (name = pj_param(start, "spm").s) { + if ((name = pj_param(start, "spm").s) != NULL) { const char *value = NULL; char *next_str = NULL; |