Refactor:maptool:rename variables

3 files changed, 10 insertions, 10 deletions

diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 815eb9fff..7af55ce83 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -50,7 +50,7 @@
 #define SLIZE_SIZE_DEFAULT_GB 1
 long long slice_size=SLIZE_SIZE_DEFAULT_GB*1024ll*1024*1024;
 int attr_debug_level=1;
-int ignore_unkown = 0;
+int ignore_unknown = 0;
 GHashTable *dedupe_ways_hash;
 int phase;
 int slices;
@@ -324,7 +324,7 @@ struct maptool_params {
 	char *md5file;
 	int start;
 	int end;
-	int output;
+	int dump;
 	int o5m;
 	int compression_level;
 	int protobuf;
@@ -404,7 +404,7 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index)
 		p->protobufdb=optarg;
 		break;
 	case 'D':
-		p->output=1;
+		p->dump=1;
 		break;
 	case 'E':
 		experimental=1;
@@ -420,7 +420,7 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index)
 		break;
 	case 'O':
 		p->protobufdb_operation=optarg;
-		p->output=1;
+		p->dump=1;
 		break;
 	case 'P':
 		p->protobuf=1;
@@ -480,7 +480,7 @@ parse_option(struct maptool_params *p, char **argv, int argc, int *option_index)
 		break;
 	case 'n':
 		fprintf(stderr,"I will IGNORE unknown types\n");
-		ignore_unkown=1;
+		ignore_unknown=1;
 		break;
 	case 'k':
 		fprintf(stderr,"I will KEEP tmp files\n");
@@ -965,7 +965,7 @@ int main(int argc, char **argv)
 		fprintf(stderr,"No experimental features available in this version, aborting. \n");
 		exit(1);
 	}
-	if (optind != argc-(p.output == 1 ? 0:1))
+	if (optind != argc-(p.dump == 1 ? 0:1))
 		usage(stderr);
 	p.result=argv[optind];
 
@@ -1070,7 +1070,7 @@ int main(int argc, char **argv)
 			}
 		}
 	}
-	if (p.output == 1 && start_phase(&p,"dumping")) {
+	if (p.dump == 1 && start_phase(&p,"dumping")) {
 		maptool_dump(&p, suffix);
 		exit(0);
 	}
diff --git a/navit/maptool/maptool.h b/navit/maptool/maptool.h
index eca708591..f1f45fff7 100644
--- a/navit/maptool/maptool.h
+++ b/navit/maptool/maptool.h
@@ -239,7 +239,7 @@ extern struct item_bin *tmp_item_bin;
 extern long long slice_size;
 extern int attr_debug_level;
 extern char *suffix;
-extern int ignore_unkown;
+extern int ignore_unknown;
 extern GHashTable *dedupe_ways_hash;
 extern int slices;
 extern struct buffer node_buffer;
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index 02278ae86..ac8dc3e89 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -1784,7 +1784,7 @@ osm_end_way(struct maptool_osm *osm)
 		add_flags=0;
 		if (types[i] == type_none)
 			continue;
-		if (ignore_unkown && (types[i] == type_street_unkn || types[i] == type_point_unkn))
+		if (ignore_unknown && (types[i] == type_street_unkn || types[i] == type_point_unkn))
 			continue;
 		if (types[i] != type_street_unkn) {
 			if(types[i]<type_area) 	
@@ -1874,7 +1874,7 @@ osm_end_node(struct maptool_osm *osm)
 	for (i = 0 ; i < count ; i++) {
 		if (types[i] == type_none)
 			continue;
-		if (ignore_unkown && (types[i] == type_street_unkn || types[i] == type_point_unkn))
+		if (ignore_unknown && (types[i] == type_street_unkn || types[i] == type_point_unkn))
 			continue;
 		item_bin=init_item(types[i]);
 		if (item_is_town(*item_bin) && attr_strings[attr_string_population])