X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=src%2Fir.c;h=63fe72bbdfa353ceea2324c3da81779f8d880ef5;hp=f46d988137ed74c4fd95991470c5026373d292bd;hb=1f5e543b9088b021c859a2995a273dfa3397d381;hpb=813c9a9288b0e1c76d290749d012158b528ccc98 diff --git a/src/ir.c b/src/ir.c index f46d988..63fe72b 100644 --- a/src/ir.c +++ b/src/ir.c @@ -247,11 +247,11 @@ struct ir_framebox_t* ir_set_add_framebox if (bytes_identical(iter->header.data_name, name)) return iter; if (iter->header.nextsib != NULL) - { iter = iter->header.nextsib.framebox; + { iter = (struct ir_framebox_t*) iter->header.nextsib; goto check; } iter->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t); - return iter->header.nextsib.framebox; + return (struct ir_framebox_t*) iter->header.nextsib; } /* Match two null-terminated bytestrings @@ -295,7 +295,7 @@ void ir_set_assign_data break; case ADAT: if (set->audio == NULL) - { set->audio = setdata; + { set->audio = (struct ir_simplex_t*) setdata; return; } simplex = set->audio; @@ -307,17 +307,17 @@ void ir_set_assign_data return; } else - simplex = simplex->header.nextsib->audio; + simplex = (struct ir_simplex_t*) simplex->header.nextsib; simplex->header.nextsib = setdata; break; case LDAT: if (set->links == NULL) - { set->links = setdata; + { set->links = (struct ir_link_t*) setdata; return; } link = set->links; while (link->header.nextsib != NULL) - link = link->header.nextsib.link; + link = (struct ir_link_t*) link->header.nextsib; link->header.nextsib = setdata; break; default: @@ -332,7 +332,7 @@ void ir_set_assign_ref ) { if (set->ref != 0) wprintf("Ref override: 0x%lx -> 0x%lx for set %s\n", - set->ref, ref, set->name); + (long unsigned) set->ref, (long unsigned) ref, set->name); set->ref = ref; //TODO: reflist_add(set); }