Selaa lähdekoodia

fail gracefully if -p does not have any lsatmet= arguments

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54904 15284696-431f-4ddb-bdfa-cd5b030d7da7
Yann Chemin 12 vuotta sitten
vanhempi
commit
afd123b88e
1 muutettua tiedostoa jossa 10 lisäystä ja 10 poistoa
  1. 10 10
      imagery/i.landsat.toar/main.c

+ 10 - 10
imagery/i.landsat.toar/main.c

@@ -261,33 +261,33 @@ int main(int argc, char *argv[])
         lsat.flag = METADATAFILE;
         lsat_metadata( met, &lsat );
 	if(print_meta) {
+		if (lsatmet->answer == NULL) {
+			G_fatal_error(_("Please use a metadata keyword with -p"));
+		}
 		if (strcmp(lsatmet->answer, "number") == 0) {
 			fprintf(stdout,"%d\n",lsat.number);
 		}
-		else if (strcmp(lsatmet->answer, "creation") == 0) {
+		if (strcmp(lsatmet->answer, "creation") == 0) {
 			fprintf(stdout,"%s\n",lsat.creation);
 		}
-		else if (strcmp(lsatmet->answer, "date") == 0) {
+		if (strcmp(lsatmet->answer, "date") == 0) {
 			fprintf(stdout,"%s\n",lsat.date);
 		}
-		else if (strcmp(lsatmet->answer, "sun_elev") == 0) {
+		if (strcmp(lsatmet->answer, "sun_elev") == 0) {
 			fprintf(stdout,"%f\n",lsat.sun_elev);
 		}
-		else if (strcmp(lsatmet->answer, "sensor") == 0) {
+		if (strcmp(lsatmet->answer, "sensor") == 0) {
 			fprintf(stdout,"%s\n",lsat.sensor);
 		}
-		else if (strcmp(lsatmet->answer, "bands") == 0) {
+		if (strcmp(lsatmet->answer, "bands") == 0) {
 			fprintf(stdout,"%d\n",lsat.bands);
 		}
-		else if (strcmp(lsatmet->answer, "sunza") == 0) {
+		if (strcmp(lsatmet->answer, "sunza") == 0) {
 			fprintf(stdout,"%f\n",lsat.sunza);
 		}
-		else if (strcmp(lsatmet->answer, "time") == 0) {
+		if (strcmp(lsatmet->answer, "time") == 0) {
 			fprintf(stdout,"%f\n",lsat.time);
 		}
-		else {
-			G_fatal_error(_("Please use a metadata keyword with -p"));
-		}
     		exit(EXIT_SUCCESS);
 	}
         G_debug(1, "lsat.number = %d, lsat.sensor = [%s]", lsat.number, lsat.sensor);