Fixed some alignment errors

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@365 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/src/data/mg/street.c b/navit/src/data/mg/street.c
index 26bfaed..45dbabc 100644 (file)
--- a/navit/src/data/mg/street.c
+++ b/navit/src/data/mg/street.c
@@ -28,14 +28,14 @@ static void
 street_name_numbers_get(struct street_name_numbers *name_numbers, unsigned char **p)
 {
        unsigned char *start=*p;
-       name_numbers->len=get_u16(p);
+       name_numbers->len=get_u16_unal(p);
        name_numbers->tag=get_u8(p);
-       name_numbers->dist=get_u32(p);
-       name_numbers->country=get_u32(p);
+       name_numbers->dist=get_u32_unal(p);
+       name_numbers->country=get_u32_unal(p);
        name_numbers->c=coord_get(p);
        name_numbers->first=get_u24(p);
        name_numbers->last=get_u24(p);
-       name_numbers->segment_count=get_u32(p);
+       name_numbers->segment_count=get_u32_unal(p);
        name_numbers->segments=(struct street_name_segment *)(*p);
        (*p)+=sizeof(struct street_name_segment)*name_numbers->segment_count;
        name_numbers->aux_len=name_numbers->len-(*p-start);
@@ -49,7 +49,7 @@ static void
 street_name_number_get(struct street_name_number *name_number, unsigned char **p)
 {
        unsigned char *start=*p;
-        name_number->len=get_u16(p);
+        name_number->len=get_u16_unal(p);
         name_number->tag=get_u8(p);
         name_number->c=coord_get(p);
         name_number->first=get_u24(p);

diff --git a/navit/src/data/mg/town.c b/navit/src/data/mg/town.c
index 838bc2c..df880b7 100644 (file)
--- a/navit/src/data/mg/town.c
+++ b/navit/src/data/mg/town.c
@@ -185,11 +185,11 @@ town_search_compare(unsigned char **p, struct map_rect_priv *mr)
         int country, d;
         char *name;
 
-       country=get_u16(p);
+       country=get_u16_unal(p);
        dbg(1,"country 0x%x ", country);
        name=get_string(p);
        dbg(1,"name '%s' ",name);
-       mr->search_blk_count=get_u32(p);
+       mr->search_blk_count=get_u32_unal(p);
        mr->search_blk_off=(struct block_offset *)(*p);
        dbg(1,"len %d ", mr->search_blk_count);
        (*p)+=mr->search_blk_count*4;

diff --git a/navit/src/data/mg/tree.c b/navit/src/data/mg/tree.c
index aedce72..30852d2 100644 (file)
--- a/navit/src/data/mg/tree.c
+++ b/navit/src/data/mg/tree.c
@@ -166,7 +166,7 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
        }
        tsn->low=tsn->high;
        tsn->last=*p;
-       tsn->high=get_u32(p);
+       tsn->high=get_u32_unal(p);
        dbg(1,"saving last3 %d %p\n", ts->curr_node, tsn->last);
        if (*p < tsn->end)
                return (tsn->low == 0xffffffff ? 1 : 0);
@@ -175,7 +175,7 @@ int tree_search_next(struct tree_search *ts, unsigned char **p, int dir)
                dbg(1,"low 0x%x\n", tsn->low);
                tsn=tree_search_enter(ts, tsn->low);
                *p=tsn->p;
-               tsn->high=get_u32(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,"high4=0x%x\n", tsn->high);
@@ -194,7 +194,7 @@ int tree_search_next_lin(struct tree_search *ts, unsigned char **p)
                ts->nodes[ts->last_node].last=*p;
        *p=tsn->last;
        for (;;) {
-               high=get_u32(p);
+               high=get_u32_unal(p);
                if (*p < tsn->end) {
                        ts->last_node=ts->curr_node;
                        while (high != 0xffffffff) {