From 9640e7c1bf45757d9a0d21e65b4ec55eb720c6ee Mon Sep 17 00:00:00 2001 From: Frank Warmerdam Date: Thu, 24 Apr 2003 19:18:52 +0000 Subject: dont emit error after listing units/ellpisoids in geod git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1144 4e78687f-474d-0410-85f9-8d5e500ac6b2 --- ChangeLog | 5 +++++ src/geod.c | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index cebceb17..266175f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-04-24 Frank Warmerdam + + * src/geod.c: Don't emit an error message after listing ellipsoids + or units, as per request from Dan Jacobson. + 2003-04-09 Frank Warmerdam * man/man1/{proj,cs2cs}.1: moved -m option from cs2cs.1 to diff --git a/src/geod.c b/src/geod.c index b90030cf..68a48e22 100644 --- a/src/geod.c +++ b/src/geod.c @@ -177,22 +177,20 @@ noargument: emess(1,"missing argument for -%c",*arg); continue; case 'l': if (!arg[1] || arg[1] == 'e') { /* list of ellipsoids */ - struct PJ_ELLPS *le; - - for (le = pj_ellps; le->id ; ++le) - (void)printf("%9s %-16s %-16s %s\n", - le->id, le->major, le->ell, le->name); - emess(1,"invalid list option: l%c",arg[1]); - emess(1,"-l[p|e] terminates program"); + struct PJ_ELLPS *le; + + for (le = pj_ellps; le->id ; ++le) + (void)printf("%9s %-16s %-16s %s\n", + le->id, le->major, le->ell, le->name); } else if (arg[1] == 'u') { /* list of units */ - struct PJ_UNITS *lu; - - for (lu = pj_units; lu->id ; ++lu) - (void)printf("%12s %-20s %s\n", - lu->id, lu->to_meter, lu->name); + struct PJ_UNITS *lu; + + for (lu = pj_units; lu->id ; ++lu) + (void)printf("%12s %-20s %s\n", + lu->id, lu->to_meter, lu->name); } else - emess(1,"invalid list option: l%c",arg[1]); - emess(1,"will not proceed after display list option"); + emess(1,"invalid list option: l%c",arg[1]); + exit( 0 ); case 'p': /* output azimuths as positive */ pos_azi = 1; continue; -- cgit v1.2.3