projects
/
henge
/
apc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes
[henge/apc.git]
/
src
/
ir.c
diff --git
a/src/ir.c
b/src/ir.c
index
7c52f3c
..
f46d988
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-250,7
+250,8
@@
struct ir_framebox_t* ir_set_add_framebox
{ iter = iter->header.nextsib.framebox;
\r
goto check;
\r
}
\r
{ iter = iter->header.nextsib.framebox;
\r
goto check;
\r
}
\r
- return iter->header.nextsib = struct_alloc(ir_framebox_t);
\r
+ iter->header.nextsib = (union ir_setdata_t*) struct_alloc(ir_framebox_t);
\r
+ return iter->header.nextsib.framebox;
\r
}
\r
\r
/* Match two null-terminated bytestrings
\r
}
\r
\r
/* Match two null-terminated bytestrings
\r
@@
-294,30
+295,30
@@
void ir_set_assign_data
break;
\r
case ADAT:
\r
if (set->audio == NULL)
\r
break;
\r
case ADAT:
\r
if (set->audio == NULL)
\r
- { set->audio = setdata
->audio
;
\r
+ { set->audio = setdata;
\r
return;
\r
}
\r
simplex = set->audio;
\r
while (simplex->header.nextsib != NULL)
\r
if (bytes_identical(simplex->header.data_name, setdata->header.data_name))
\r
{ wprintf("Duplicate audio %s\n", setdata->header.data_name);
\r
return;
\r
}
\r
simplex = set->audio;
\r
while (simplex->header.nextsib != NULL)
\r
if (bytes_identical(simplex->header.data_name, setdata->header.data_name))
\r
{ wprintf("Duplicate audio %s\n", setdata->header.data_name);
\r
- *simplex =
*(setdata->audio)
;
\r
+ *simplex =
setdata->audio
;
\r
//setdata->audio is now a pointer to redundant, unused memory.
\r
return;
\r
}
\r
else
\r
//setdata->audio is now a pointer to redundant, unused memory.
\r
return;
\r
}
\r
else
\r
- simplex = simplex->header.nextsib
.
audio;
\r
- simplex->header.nextsib
.audio = setdata->audio
;
\r
+ simplex = simplex->header.nextsib
->
audio;
\r
+ simplex->header.nextsib
= setdata
;
\r
break;
\r
case LDAT:
\r
if (set->links == NULL)
\r
break;
\r
case LDAT:
\r
if (set->links == NULL)
\r
- { set->links = setdata
->link
;
\r
+ { set->links = setdata;
\r
return;
\r
}
\r
link = set->links;
\r
while (link->header.nextsib != NULL)
\r
link = link->header.nextsib.link;
\r
return;
\r
}
\r
link = set->links;
\r
while (link->header.nextsib != NULL)
\r
link = link->header.nextsib.link;
\r
- link->header.nextsib
.link = setdata->link
;
\r
+ link->header.nextsib
= setdata
;
\r
break;
\r
default:
\r
fprintf(stderr, "Unknown setdata type %x\n", setdata->header.type);
\r
break;
\r
default:
\r
fprintf(stderr, "Unknown setdata type %x\n", setdata->header.type);
\r
@@
-330,7
+331,7
@@
void ir_set_assign_ref
long long ref
\r
)
\r
{ if (set->ref != 0)
\r
long long ref
\r
)
\r
{ if (set->ref != 0)
\r
- wprintf("Ref override: 0x%
x -> 0x%
x for set %s\n",
\r
+ wprintf("Ref override: 0x%
lx -> 0x%l
x for set %s\n",
\r
set->ref, ref, set->name);
\r
set->ref = ref;
\r
//TODO: reflist_add(set);
\r
set->ref, ref, set->name);
\r
set->ref = ref;
\r
//TODO: reflist_add(set);
\r
@@
-340,10
+341,7
@@
void ir_data_assign_path
( union ir_setdata_t* setdata,
\r
uint8_t* path
\r
)
\r
( union ir_setdata_t* setdata,
\r
uint8_t* path
\r
)
\r
-{ if (setdata->header.src_filename)
\r
- wprintf("Path override: %s -> %s for set %s\n",
\r
- setdata->header.src_filename, path, setdata->name);
\r
- setdata->header.src_filename = path;
\r
+{ setdata->header.src_filename = path;
\r
//TODO: internal strdup, not assign (= path;)
\r
}
\r
\r
//TODO: internal strdup, not assign (= path;)
\r
}
\r
\r