diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-18 21:31:28 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:53 +0100 |
| commit | 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch) | |
| tree | 1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/geod.cpp | |
| parent | 919dc5ca50839541568ef5c0f18f2156d639beef (diff) | |
| download | PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip | |
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/geod.cpp')
| -rw-r--r-- | src/geod.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/geod.cpp b/src/geod.cpp index bb52818e..d7741679 100644 --- a/src/geod.cpp +++ b/src/geod.cpp @@ -17,7 +17,7 @@ tag = '#', /* beginning of line tag character */ pos_azi = 0, /* output azimuths as positive values */ inverse = 0; /* != 0 then inverse geodesic */ static char -*oform = (char *)0, /* output format for decimal degrees */ +*oform = (char *)nullptr, /* output format for decimal degrees */ *osform = "%.3f", /* output format for S */ pline[50], /* work string */ *usage = @@ -133,7 +133,7 @@ int main(int argc, char **argv) { FILE *fid; static int eargc = 0, c; - if ((emess_dat.Prog_name = strrchr(*argv,'/')) != NULL) ++emess_dat.Prog_name; + if ((emess_dat.Prog_name = strrchr(*argv,'/')) != nullptr) ++emess_dat.Prog_name; else emess_dat.Prog_name = *argv; inverse = ! strncmp(emess_dat.Prog_name, "inv", 3); if (argc <= 1 ) { @@ -223,7 +223,7 @@ noargument: emess(1,"missing argument for -%c",*arg); fid = stdin; emess_dat.File_name = "<stdin>"; } else { - if ((fid = fopen(*eargv, "r")) == NULL) { + if ((fid = fopen(*eargv, "r")) == nullptr) { emess(-2, *eargv, "input file"); continue; } @@ -232,7 +232,7 @@ noargument: emess(1,"missing argument for -%c",*arg); emess_dat.File_line = 0; process(fid); (void)fclose(fid); - emess_dat.File_name = (char *)0; + emess_dat.File_name = (char *)nullptr; } } exit(0); /* normal completion */ |