Fix:core:Fix warnings for incorrect format strings: use %td, %zu.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5880 ffa7fe5e-494d-0410-b361-a75ebd5db220

3 files changed, 24 insertions, 23 deletions

diff --git a/navit/map/binfile/binfile.c b/navit/map/binfile/binfile.c
index 9f373ee4..d337c2f5 100644
--- a/navit/map/binfile/binfile.c
+++ b/navit/map/binfile/binfile.c
@@ -295,7 +295,7 @@ binfile_read_cd(struct map_priv *m, int offset, int len)
 	}
 	cd=(struct zip_cd *)file_data_read(m->fi,cdoffset+offset, sizeof(*cd)+len);
 	if (cd) {
-		dbg(1,"cd at "LONGLONG_FMT" %d bytes\n",cdoffset+offset, sizeof(*cd)+len);
+		dbg(1,"cd at "LONGLONG_FMT" %zu bytes\n",cdoffset+offset, sizeof(*cd)+len);
 		cd_to_cpu(cd);
 		dbg(1,"sig 0x%x\n", cd->zipcensig);
 		if (cd->zipcensig != zip_cd_sig) {
@@ -685,7 +685,7 @@ binfile_coord_set(void *priv_data, struct coord *c, int count, enum change_mode
 
 	{
 		int *i=t->pos,j=0;
-		dbg(0,"Before: pos_coord=%d\n",t->pos_coord-i);
+		dbg(0,"Before: pos_coord=%td\n",t->pos_coord-i);
 		while (i < t->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 
@@ -742,18 +742,18 @@ binfile_coord_set(void *priv_data, struct coord *c, int count, enum change_mode
 	tn=mr->t;
 	tn->pos_coord=tn->pos_coord_start+coffset;
 	tn->pos_attr=tn->pos_attr_start+aoffset;
-	dbg(0,"moving %d ints from offset %d to %d\n",move_len,tn->pos_coord_start+move_offset-data,tn->pos_coord_start+move_offset+delta-data);
+	dbg(0,"moving %d ints from offset %td to %td\n",move_len,tn->pos_coord_start+move_offset-data,tn->pos_coord_start+move_offset+delta-data);
 	memmove(tn->pos_coord_start+move_offset+delta, tn->pos_coord_start+move_offset, move_len*4);
 	{
 		int *i=tn->pos,j=0;
-		dbg(0,"After move: pos_coord=%d\n",tn->pos_coord-i);
+		dbg(0,"After move: pos_coord=%td\n",tn->pos_coord-i);
 		while (i < tn->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 	}
 	if (mode != change_mode_append)
 		tn->pos_coord+=move_offset;
 	if (mode != change_mode_delete) {
-		dbg(0,"writing %d ints at offset %d\n",count*2,write_offset+tn->pos_coord_start-data);
+		dbg(0,"writing %d ints at offset %td\n",count*2,write_offset+tn->pos_coord_start-data);
 		for (i = 0 ; i < count ; i++) {
 			tn->pos_coord_start[write_offset++]=c[i].x;
 			tn->pos_coord_start[write_offset++]=c[i].y;
@@ -762,7 +762,7 @@ binfile_coord_set(void *priv_data, struct coord *c, int count, enum change_mode
 	}
 	{
 		int *i=tn->pos,j=0;
-		dbg(0,"After: pos_coord=%d\n",tn->pos_coord-i);
+		dbg(0,"After: pos_coord=%td\n",tn->pos_coord-i);
 		while (i < tn->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 	}
@@ -781,7 +781,7 @@ binfile_attr_set(void *priv_data, struct attr *attr, enum change_mode mode)
 
 	{
 		int *i=t->pos,j=0;
-		dbg(0,"Before: pos_attr=%d\n",t->pos_attr-i);
+		dbg(0,"Before: pos_attr=%td\n",t->pos_attr-i);
 		while (i < t->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 
@@ -846,20 +846,20 @@ binfile_attr_set(void *priv_data, struct attr *attr, enum change_mode mode)
 	tn=mr->t;
 	tn->pos_coord=tn->pos_coord_start+coffset;
 	tn->pos_attr=tn->pos_attr_start+offset;
-	dbg(0,"attr start %d offset %d\n",tn->pos_attr_start-data,offset);
-	dbg(0,"moving %d ints from offset %d to %d\n",move_len,tn->pos_attr_start+move_offset-data,tn->pos_attr_start+move_offset+delta-data);
+	dbg(0,"attr start %td offset %d\n",tn->pos_attr_start-data,offset);
+	dbg(0,"moving %d ints from offset %td to %td\n",move_len,tn->pos_attr_start+move_offset-data,tn->pos_attr_start+move_offset+delta-data);
 	memmove(tn->pos_attr_start+move_offset+delta, tn->pos_attr_start+move_offset, move_len*4);
 	if (mode != change_mode_append)
 		tn->pos_attr+=delta;
 	{
 		int *i=tn->pos,j=0;
-		dbg(0,"After move: pos_attr=%d\n",tn->pos_attr-i);
+		dbg(0,"After move: pos_attr=%td\n",tn->pos_attr-i);
 		while (i < tn->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 	}
 	if (nattr_len) {
 		int *nattr=tn->pos_attr_start+write_offset;
-		dbg(0,"writing %d ints at %d\n",nattr_len,nattr-data);
+		dbg(0,"writing %d ints at %td\n",nattr_len,nattr-data);
 		nattr[0]=cpu_to_le32(nattr_len-1);
 		nattr[1]=cpu_to_le32(attr->type);
 		memcpy(nattr+2, attr_data_get(attr), nattr_size);
@@ -867,7 +867,9 @@ binfile_attr_set(void *priv_data, struct attr *attr, enum change_mode mode)
 	}
 	{
 		int *i=tn->pos,j=0;
-		dbg(0,"After: pos_attr=%d\n",tn->pos_attr-i);
+		dbg(0,"After: pos_attr=%td\n",tn->pos_attr-i);
+		while (i < tn->pos_next)
+		dbg(0,"After: pos_attr=%td\n",tn->pos_attr-i);
 		while (i < tn->pos_next)
 			dbg(0,"%d:0x%x\n",j++,*i++);
 	}
@@ -936,7 +938,6 @@ zipfile_to_tile(struct map_priv *m, struct zip_cd *cd, struct tile *t)
 	t->start=(int *)binfile_read_content(m, fi, binfile_cd_offset(cd), lfh);
 	t->end=t->start+lfh->zipuncmp/4;
 	t->fi=fi;
-	dbg(1,"0x%x '%s' %d %d,%d\n", lfh->ziplocsig, buffer, sizeof(*cd)+cd->zipcfnl, lfh->zipsize, lfh->zipuncmp);
 	file_data_free(fi, (unsigned char *)zipfn);
 	file_data_free(fi, (unsigned char *)lfh);
 	return t->start != NULL;
@@ -1241,7 +1242,7 @@ download_directory_do(struct map_download *download)
 		if (!size_ret)
 			return 0;
 		if (size_ret != sizeof(*cd) || cd->zipcensig != zip_cd_sig) {
-			dbg(0,"error1 size=%d vs %d\n",size_ret, sizeof(*cd));
+			dbg(0,"error1 size=%d vs %zu\n",size_ret, sizeof(*cd));
 			return 0;
 		}
 		file_data_write(download->file, download->offset, sizeof(*cd), (unsigned char *)cd);
@@ -2772,7 +2773,7 @@ plugin_init(void)
 {
 	dbg(1,"binfile: plugin_init\n");
 	if (sizeof(struct zip_cd) != 46) {
-		dbg(0,"error: sizeof(struct zip_cd)=%d\n",sizeof(struct zip_cd));
+		dbg(0,"error: sizeof(struct zip_cd)=%zu\n",sizeof(struct zip_cd));
 	}
 	plugin_register_map_type("binfile", map_new_binfile);
 }
diff --git a/navit/map/mg/street.c b/navit/map/mg/street.c
index 18e35aa7..363980be 100644
--- a/navit/map/mg/street.c
+++ b/navit/map/mg/street.c
@@ -858,7 +858,7 @@ street_search_get_item_street_name(struct map_rect_priv *mr)
 		block_get_byindex(mr->m->file[file_strname_stn], mr->search_block, &mr->b);
 		mr->b.p=mr->b.block_start+12;
 	}
-	dbg(1,"name id 0x%x\n", mr->b.p-mr->m->file[file_strname_stn]->begin);
+	dbg(1,"name id %td\n", mr->b.p-mr->m->file[file_strname_stn]->begin);
 	if (! mr->search_blk_count)
 		return NULL;
 	for (;;) {
diff --git a/navit/map/mg/tree.c b/navit/map/mg/tree.c
index 27459cf7..3b6a2c2d 100644
--- a/navit/map/mg/tree.c
+++ b/navit/map/mg/tree.c
@@ -83,7 +83,7 @@ tree_search_h(struct file *file, unsigned int search)
 		thdr=(struct tree_hdr_h *)p;
 		p+=sizeof(*thdr);
 		end=p+tree_hdr_h_get_size(thdr);
-		dbg(1,"@0x%x\n", p-file->begin);
+		dbg(1,"@%td\n", p-file->begin);
 		last=0;
 		while (p < end) {
 			tleaf=(struct tree_leaf_h *)p;
@@ -119,7 +119,7 @@ tree_search_v(struct file *file, int offset, int search)
 		thdr=(struct tree_hdr_v *)p;
 		p+=sizeof(*thdr);
 		count=tree_hdr_v_get_count(thdr);
-		dbg(1,"offset=0x%x count=0x%x\n", p-file->begin, count);
+		dbg(1,"offset=%td count=0x%x\n", p-file->begin, count);
 		while (count--) {
 			tleaf=(struct tree_leaf_v *)p;
 			p+=sizeof(*tleaf);
@@ -183,7 +183,7 @@ tree_search_enter(struct tree_search *ts, int offset)
 	tsn->end=p+tree_hdr_get_size(tsn->hdr);
 	tsn->low=tree_hdr_get_low(tsn->hdr);
 	tsn->high=tree_hdr_get_low(tsn->hdr);
-	dbg(1,"pos 0x%x addr 0x%x size 0x%x low 0x%x end 0x%x\n", p-ts->f->begin, tree_hdr_get_addr(tsn->hdr), tree_hdr_get_size(tsn->hdr), tree_hdr_get_low(tsn->hdr), tsn->end-ts->f->begin);
+	dbg(1,"pos %td addr 0x%ux size 0x%ux low 0x%ux end %tu\n", p-ts->f->begin, tree_hdr_get_addr(tsn->hdr), tree_hdr_get_size(tsn->hdr), tree_hdr_get_low(tsn->hdr), tsn->end-ts->f->begin);
 	return tsn;
 }
 
@@ -202,7 +202,7 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
 			*p=tsn->p;
 			tsn->high=get_u32(p);
 			ts->last_node=ts->curr_node;
-			dbg(1,"saving last2 %d 0x%x\n", ts->curr_node, tsn->last-ts->f->begin);
+			dbg(1,"saving last2 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
 			dbg(1,"high2=0x%x\n", tsn->high);
 			return 0;
 		}
@@ -221,7 +221,7 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
 		*p=tsn->p;
 		tsn->high=get_u32_unal(p);
 		ts->last_node=ts->curr_node;
-		dbg(1,"saving last4 %d 0x%x\n", ts->curr_node, tsn->last-ts->f->begin);
+		dbg(1,"saving last4 %d %td\n", ts->curr_node, tsn->last-ts->f->begin);
 		dbg(1,"high4=0x%x\n", tsn->high);
 		return 0;
 	}
@@ -233,7 +233,7 @@ int tree_search_next_lin(struct tree_search *ts, unsigned char **p)
 	struct tree_search_node *tsn=&ts->nodes[ts->curr_node];
 	int high;
 	
-	dbg(1,"pos=%d 0x%x\n", ts->curr_node, *p-ts->f->begin);
+	dbg(1,"pos=%d %td\n", ts->curr_node, *p-ts->f->begin);
 	if (*p)
 		ts->nodes[ts->last_node].last=*p;
 	*p=tsn->last;
@@ -248,7 +248,7 @@ int tree_search_next_lin(struct tree_search *ts, unsigned char **p)
 			}
 			return 1;
 		}
-		dbg(1,"eon %d 0x%x 0x%x\n", ts->curr_node, *p-ts->f->begin, tsn->end-ts->f->begin);
+		dbg(1,"eon %d %td %td\n", ts->curr_node, *p-ts->f->begin, tsn->end-ts->f->begin);
 		if (! ts->curr_node)
 			break;
 		ts->curr_node--;