diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-28 16:05:37 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2004-10-28 16:05:37 +0000 |
| commit | df972a044023b6aa99e7d8d056a7533370abce88 (patch) | |
| tree | 3e08f07ad99961ec52aa74ca2ba8fea014ca3e3b /src/cs2cs.c | |
| parent | fb5affcf0f6c71be146070be63be730f836576f5 (diff) | |
| download | PROJ-df972a044023b6aa99e7d8d056a7533370abce88.tar.gz PROJ-df972a044023b6aa99e7d8d056a7533370abce88.zip | |
avoid using global variables from DLL
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1255 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/cs2cs.c')
| -rw-r--r-- | src/cs2cs.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/cs2cs.c b/src/cs2cs.c index 39b82d8b..e94e71a8 100644 --- a/src/cs2cs.c +++ b/src/cs2cs.c @@ -29,6 +29,9 @@ ****************************************************************************** * * $Log$ + * Revision 1.8 2004/10/28 16:05:37 fwarmerdam + * avoid using global variables from DLL + * * Revision 1.7 2003/03/25 17:53:13 warmerda * modified so that -f formats are used for Z as well * @@ -197,7 +200,7 @@ int main(int argc, char **argv) else emess_dat.Prog_name = *argv; inverse = ! strncmp(emess_dat.Prog_name, "inv", 3); if (argc <= 1 ) { - (void)fprintf(stderr, usage, pj_release, emess_dat.Prog_name); + (void)fprintf(stderr, usage, pj_get_release(), emess_dat.Prog_name); exit (0); } /* process run line arguments */ @@ -227,7 +230,7 @@ int main(int argc, char **argv) int do_long = arg[1] == 'P', c; char *str; - for (lp = pj_list ; lp->id ; ++lp) { + for (lp = pj_get_list_ref() ; lp->id ; ++lp) { (void)printf("%s : ", lp->id); if (do_long) /* possibly multiline description */ (void)puts(*lp->descr); @@ -242,7 +245,7 @@ int main(int argc, char **argv) struct PJ_LIST *lp; arg += 2; - for (lp = pj_list ; lp->id ; ++lp) + for (lp = pj_get_list_ref() ; lp->id ; ++lp) if (!strcmp(lp->id, arg)) { (void)printf("%9s : %s\n", lp->id, *lp->descr); break; @@ -250,20 +253,20 @@ int main(int argc, char **argv) } else if (arg[1] == 'e') { /* list ellipses */ struct PJ_ELLPS *le; - for (le = pj_ellps; le->id ; ++le) + for (le = pj_get_ellps_ref(); le->id ; ++le) (void)printf("%9s %-16s %-16s %s\n", le->id, le->major, le->ell, le->name); } else if (arg[1] == 'u') { /* list units */ struct PJ_UNITS *lu; - for (lu = pj_units; lu->id ; ++lu) + for (lu = pj_get_units_ref(); lu->id ; ++lu) (void)printf("%12s %-20s %s\n", lu->id, lu->to_meter, lu->name); } else if (arg[1] == 'd') { /* list datums */ struct PJ_DATUMS *ld; printf("__datum_id__ __ellipse___ __definition/comments______________________________\n" ); - for (ld = pj_datums; ld->id ; ++ld) + for (ld = pj_get_datums_ref(); ld->id ; ++ld) { printf("%12s %-12s %-30s\n", ld->id, ld->ellipse_id, ld->defn); @@ -273,7 +276,7 @@ int main(int argc, char **argv) } else if( arg[1] == 'm') { /* list prime meridians */ struct PJ_PRIME_MERIDIANS *lpm; - for (lpm = pj_prime_meridians; lpm->id ; ++lpm) + for (lpm = pj_get_prime_meridians_ref(); lpm->id ; ++lpm) (void)printf("%12s %-30s\n", lpm->id, lpm->defn); } else |