1 files changed, 7 insertions, 20 deletions

diff --git a/navit/map/mg/block.c b/navit/map/mg/block.c
index b2bb64ac0..747e49b15 100644
--- a/navit/map/mg/block.c
+++ b/navit/map/mg/block.c
@@ -77,7 +77,7 @@ block_get_byid(struct file *file, int id, unsigned char **p_ret)
 int
 block_get_byindex(struct file *file, int idx, struct block_priv *blk)
 {
-	dbg(lvl_debug,"idx=%d\n", idx);
+	dbg(lvl_debug,"idx=%d", idx);
 	blk->b=block_get_byid(file, idx, &blk->p);
 	blk->block_start=(unsigned char *)(blk->b);
 	blk->p_start=blk->p;
@@ -177,7 +177,7 @@ block_next_lin(struct map_rect_priv *mr)
 		else
 			mr->b.p=mr->b.block_start+block_get_blocks(mr->b.b)*512;
 		if (mr->b.p >= mr->file->end) {
-			dbg(lvl_debug,"end of blocks %p vs %p\n", mr->b.p, mr->file->end);
+			dbg(lvl_debug,"end of blocks %p vs %p", mr->b.p, mr->file->end);
 			return 0;
 		}
 		mr->b.block_start=mr->b.p;
@@ -185,17 +185,17 @@ block_next_lin(struct map_rect_priv *mr)
 		mr->b.p_start=mr->b.p;
 		mr->b.end=mr->b.block_start+block_get_size(mr->b.b);
 		if (block_get_count(mr->b.b) == -1) {
-			dbg(lvl_warning,"empty blocks\n");
+			dbg(lvl_warning,"empty blocks");
 			return 0;
 		}
 		block_get_r(mr->b.b, &r);
 		if (!mr->cur_sel || coord_rect_overlap(&mr->cur_sel->u.c_rect, &r)) {
 			block_active_count++;
 			block_active_mem+=block_get_blocks(mr->b.b)*512-sizeof(struct block *);
-			dbg(lvl_debug,"block ok\n");
+			dbg(lvl_debug,"block ok");
 			return 1;
 		}
-		dbg(lvl_info,"block not in cur_sel\n");
+		dbg(lvl_info,"block not in cur_sel");
 	}
 }
 
@@ -210,21 +210,15 @@ block_next(struct map_rect_priv *mr)
 		return block_next_lin(mr);
 	for (;;) {
 		if (! bt->p) {
-			dbg(lvl_debug,"block 0x%x\n", bt->next);
+			dbg(lvl_debug,"block 0x%x", bt->next);
 			if (bt->next == -1)
 				return 0;
 			bt->b=block_get_byid(mr->file, bt->next, &bt->p);
 			bt->end=(unsigned char *)mr->b.bt.b+block_get_size(mr->b.bt.b);
 			bt->next=block_get_next(bt->b);
 			bt->order=0;
-			dbg(lvl_debug,"size 0x%x next 0x%x\n", block_get_size(bt->b), block_get_next(bt->b));
+			dbg(lvl_debug,"size 0x%x next 0x%x", block_get_size(bt->b), block_get_next(bt->b));
 			if (! mr->b.bt.block_count) {
-#if 0
-				if (debug) {
-					printf("idx rect ");
-					block_rect_print(&mr->b.bt.b->r);
-				}
-#endif
 				block_get_r(bt->b, &bt->r);
 				bt->r_curr=bt->r;
 				coord=get_u32(&mr->b.bt.p);
@@ -243,13 +237,6 @@ block_next(struct map_rect_priv *mr)
 		
 			r_w=bt->r_curr.rl.x-bt->r_curr.lu.x;
 			r_h=bt->r_curr.lu.y-bt->r_curr.rl.y;
-#if 0
-			if (debug) {
-				printf(" rect1 ");
-				block_rect_print(&bt->r_curr);
-				printf(" %dx%d", r_w, r_h);
-			}
-#endif
 			mr->b.b=NULL;
 			if (blk_num != -1) {
 				block_mem+=8;