projects
/
henge
/
apc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
544e32b
)
fixes
author
Jordan
<jordanlavatai@gmail.com>
Wed, 11 Jan 2017 23:13:09 +0000
(15:13 -0800)
committer
Jordan
<jordanlavatai@gmail.com>
Wed, 11 Jan 2017 23:13:09 +0000
(15:13 -0800)
src/ir.c
patch
|
blob
|
history
diff --git
a/src/ir.c
b/src/ir.c
index
5fbd52e
..
593bae1
100644
(file)
--- a/
src/ir.c
+++ b/
src/ir.c
@@
-58,7
+58,7
@@
struct ir_frameinfo_t
{ int facing, w, h; };
\r
struct ir_framedata_t
\r
{ struct ir_setdata_header_t header;
\r
{ int facing, w, h; };
\r
struct ir_framedata_t
\r
{ struct ir_setdata_header_t header;
\r
- struct ir_frameinfo_t frameinfo;
\r
+ struct ir_frameinfo_t
frameinfo;
\r
};
\r
struct ir_framebox_t
\r
{ struct ir_setdata_header_t header;
\r
};
\r
struct ir_framebox_t
\r
{ struct ir_setdata_header_t header;
\r
@@
-86,13
+86,13
@@
struct ir_class_t
uint8_t* name;
\r
};
\r
struct ir_set_t
\r
uint8_t* name;
\r
};
\r
struct ir_set_t
\r
-{ struct ir_set_t* nextchild, * nextsib;
\r
- struct ir_class_t* class;
\r
- long long ref;
\r
- uint8_t* name;
\r
- struct
framebox_t*
frameboxes;
\r
- struct
simplex_t*
audio;
\r
- struct
link_t*
links;
\r
+{ struct ir_set_t*
nextchild, * nextsib;
\r
+ struct ir_class_t*
class;
\r
+ long long
ref;
\r
+ uint8_t*
name;
\r
+ struct
ir_framebox_t*
frameboxes;
\r
+ struct
ir_simplex_t*
audio;
\r
+ struct
ir_link_t*
links;
\r
};
\r
/* Function-Like Macros */
\r
#define do_warn() do { \
\r
};
\r
/* Function-Like Macros */
\r
#define do_warn() do { \
\r
@@
-244,7
+244,7
@@
struct ir_framebox_t* ir_set_add_framebox
return set->frameboxes = struct_alloc(ir_framebox_t);
\r
iter = set->frameboxes;
\r
check:
\r
return set->frameboxes = struct_alloc(ir_framebox_t);
\r
iter = set->frameboxes;
\r
check:
\r
- if (bytes_identical(iter->header.name, name))
\r
+ if (bytes_identical(iter->header.
data_
name, name))
\r
return iter;
\r
if (iter->header.nextsib != NULL)
\r
{ iter = iter->header.nextsib;
\r
return iter;
\r
if (iter->header.nextsib != NULL)
\r
{ iter = iter->header.nextsib;
\r
@@
-279,44
+279,45
@@
void ir_set_assign_data
struct ir_link_t* link;
\r
switch (setdata->header.type)
\r
{ case FSDAT:
\r
struct ir_link_t* link;
\r
switch (setdata->header.type)
\r
{ case FSDAT:
\r
- framebox = ir_set_add_framebox(set, setdata->header.name);
\r
- if (framebox->framesheets[setdata->framesheet.frameinfo.facing] != NULL)
\r
+ framebox = ir_set_add_framebox(set, setdata->header.
data_
name);
\r
+ if (framebox->framesheets[setdata->framesheet.frameinfo.facing]
.header.data_name
!= NULL)
\r
wprintf("Duplicate framesheet [%i] %s\n",
\r
setdata->framesheet.frameinfo.facing, setdata->header.data_name);
\r
framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet;
\r
break;
\r
case MSDAT:
\r
wprintf("Duplicate framesheet [%i] %s\n",
\r
setdata->framesheet.frameinfo.facing, setdata->header.data_name);
\r
framebox->framesheets[setdata->framesheet.frameinfo.facing] = setdata->framesheet;
\r
break;
\r
case MSDAT:
\r
- framebox = ir_set_add_framebox(set, setdata->header.name);
\r
- if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing] != NULL)
\r
+ framebox = ir_set_add_framebox(set, setdata->header.
data_
name);
\r
+ if (framebox->mapsheets[setdata->mapsheet.frameinfo.facing]
.header.data_name
!= NULL)
\r
wprintf("Duplicate mapsheet [%i] %s\n",
\r
setdata->mapsheet.frameinfo.facing, setdata->header.data_name);
\r
framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet;
\r
break;
\r
case ADAT:
\r
if (set->audio == NULL)
\r
wprintf("Duplicate mapsheet [%i] %s\n",
\r
setdata->mapsheet.frameinfo.facing, setdata->header.data_name);
\r
framebox->mapsheets[setdata->mapsheet.frameinfo.facing] = setdata->mapsheet;
\r
break;
\r
case ADAT:
\r
if (set->audio == NULL)
\r
- { set->audio =
&
setdata->audio;
\r
+ { set->audio = setdata->audio;
\r
return;
\r
}
\r
simplex = set->audio;
\r
return;
\r
}
\r
simplex = set->audio;
\r
- while (simplex->header.nextsib != NULL
;
)
\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
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
simplex = simplex->header.nextsib;
\r
return;
\r
}
\r
else
\r
simplex = simplex->header.nextsib;
\r
- simplex->header.nextsib =
&
setdata->audio;
\r
+ simplex->header.nextsib = setdata->audio;
\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->link;
\r
return;
\r
}
\r
link = set->links;
\r
while (link->header.nextsib != NULL)
\r
link = link->header.nextsib;
\r
return;
\r
}
\r
link = set->links;
\r
while (link->header.nextsib != NULL)
\r
link = link->header.nextsib;
\r
- link->header.nextsib =
&
setdata->link;
\r
+ link->header.nextsib = setdata->link;
\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
@@
-339,10
+340,10
@@
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 (set->header.src_filename)
\r
+{ if (set
data
->header.src_filename)
\r
wprintf("Path override: %s -> %s for set %s\n",
\r
wprintf("Path override: %s -> %s for set %s\n",
\r
- set
->header.src_filename, path, set
->name);
\r
- set->header.src_filename = path;
\r
+ set
data->header.src_filename, path, setdata
->name);
\r
+ set
data
->header.src_filename = path;
\r
//TODO: internal strdup, not assign (= path;)
\r
}
\r
\r
//TODO: internal strdup, not assign (= path;)
\r
}
\r
\r
@@
-355,7
+356,7
@@
union ir_setdata_t* ir_framesheet
int height
\r
)
\r
{ struct ir_framedata_t* framesheet = struct_alloc(ir_framedata_t);
\r
int height
\r
)
\r
{ struct ir_framedata_t* framesheet = struct_alloc(ir_framedata_t);
\r
- framesheet->header
->
type = FSDAT;
\r
+ framesheet->header
.
type = FSDAT;
\r
framesheet->header.data_name = name;
\r
framesheet->frameinfo.facing = d;
\r
framesheet->frameinfo.w = width;
\r
framesheet->header.data_name = name;
\r
framesheet->frameinfo.facing = d;
\r
framesheet->frameinfo.w = width;
\r
@@
-367,7
+368,7
@@
union ir_setdata_t* ir_mapsheet
( uint8_t* name,
\r
apc_facing d,
\r
int width,
\r
( uint8_t* name,
\r
apc_facing d,
\r
int width,
\r
- int height
,
\r
+ int height
\r
)
\r
{ struct ir_framedata_t* mapsheet = struct_alloc(ir_framedata_t);
\r
mapsheet->header.type = MSDAT;
\r
)
\r
{ struct ir_framedata_t* mapsheet = struct_alloc(ir_framedata_t);
\r
mapsheet->header.type = MSDAT;
\r
@@
-393,7
+394,7
@@
void* stack_alloc(size_t bytes)
return pagenode_head->head;
\r
}
\r
if (PN_HEADSPACE() < bytes)
\r
return pagenode_head->head;
\r
}
\r
if (PN_HEADSPACE() < bytes)
\r
- { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE);
\r
+ { pagenode_head->next = (struct pagenode_t*) calloc(PN_ALLOCSIZE
,1
);
\r
pagenode_head = pagenode_head->next;
\r
pagenode_head->head = pagenode_head->root;
\r
}
\r
pagenode_head = pagenode_head->next;
\r
pagenode_head->head = pagenode_head->root;
\r
}
\r