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

1 files changed, 12 insertions, 14 deletions

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;