summaryrefslogtreecommitdiff
path: root/lib/skin_parser/skin_parser.c
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2010-06-17 13:54:09 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2010-06-17 13:54:09 +0000
commit95b0cefad012c3092d8e0f4c91118fe157baf6c0 (patch)
tree3657fac796b197f165af21ac1f60bac35ccb01f2 /lib/skin_parser/skin_parser.c
parent8d3dbb88094a8774cd571675d76a1319850259c5 (diff)
downloadrockbox-95b0cefad012c3092d8e0f4c91118fe157baf6c0.tar.gz
rockbox-95b0cefad012c3092d8e0f4c91118fe157baf6c0.zip
tiny clean up of memory allocation
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26887 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'lib/skin_parser/skin_parser.c')
-rw-r--r--lib/skin_parser/skin_parser.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/lib/skin_parser/skin_parser.c b/lib/skin_parser/skin_parser.c
index f7ff4ad693..9c360231e1 100644
--- a/lib/skin_parser/skin_parser.c
+++ b/lib/skin_parser/skin_parser.c
@@ -51,6 +51,8 @@ static int skin_parse_conditional(struct skin_element* element,
51static int skin_parse_comment(struct skin_element* element, char** document); 51static int skin_parse_comment(struct skin_element* element, char** document);
52static struct skin_element* skin_parse_code_as_arg(char** document); 52static struct skin_element* skin_parse_code_as_arg(char** document);
53 53
54
55
54struct skin_element* skin_parse(const char* document) 56struct skin_element* skin_parse(const char* document)
55{ 57{
56 58
@@ -836,15 +838,10 @@ static struct skin_element* skin_parse_code_as_arg(char** document)
836 838
837 839
838/* Memory management */ 840/* Memory management */
839char* skin_alloc(size_t size)
840{
841 return skin_buffer_alloc(size);
842}
843
844struct skin_element* skin_alloc_element() 841struct skin_element* skin_alloc_element()
845{ 842{
846 struct skin_element* retval = (struct skin_element*) 843 struct skin_element* retval = (struct skin_element*)
847 skin_alloc(sizeof(struct skin_element)); 844 skin_buffer_alloc(sizeof(struct skin_element));
848 retval->type = UNKNOWN; 845 retval->type = UNKNOWN;
849 retval->next = NULL; 846 retval->next = NULL;
850 retval->tag = NULL; 847 retval->tag = NULL;
@@ -858,19 +855,19 @@ struct skin_element* skin_alloc_element()
858struct skin_tag_parameter* skin_alloc_params(int count) 855struct skin_tag_parameter* skin_alloc_params(int count)
859{ 856{
860 size_t size = sizeof(struct skin_tag_parameter) * count; 857 size_t size = sizeof(struct skin_tag_parameter) * count;
861 return (struct skin_tag_parameter*)skin_alloc(size); 858 return (struct skin_tag_parameter*)skin_buffer_alloc(size);
862 859
863} 860}
864 861
865char* skin_alloc_string(int length) 862char* skin_alloc_string(int length)
866{ 863{
867 return (char*)skin_alloc(sizeof(char) * (length + 1)); 864 return (char*)skin_buffer_alloc(sizeof(char) * (length + 1));
868} 865}
869 866
870struct skin_element** skin_alloc_children(int count) 867struct skin_element** skin_alloc_children(int count)
871{ 868{
872 return (struct skin_element**) 869 return (struct skin_element**)
873 skin_alloc(sizeof(struct skin_element*) * count); 870 skin_buffer_alloc(sizeof(struct skin_element*) * count);
874} 871}
875 872
876void skin_free_tree(struct skin_element* root) 873void skin_free_tree(struct skin_element* root)