diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2010-09-26 12:27:38 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2010-09-26 12:27:38 +0000 |
commit | 74dbb3c27b4dfd40bc15886d4b198e8326d9ecf5 (patch) | |
tree | c7a0124ee7189249339f876ca5949121e028baf0 | |
parent | 8ff4f1aec9f19613e4f67d2e22ae96bec7657292 (diff) | |
download | rockbox-74dbb3c27b4dfd40bc15886d4b198e8326d9ecf5.tar.gz rockbox-74dbb3c27b4dfd40bc15886d4b198e8326d9ecf5.zip |
If BUFFER_ALLOC_DEBUG is defined, make buffer_alloc() not actually allocate anything if size==0, so code that uses buffer_alloc(0) to find out what address it would get keeps working
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28174 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/buffer.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/firmware/buffer.c b/firmware/buffer.c index a21a882ff2..4ede24df21 100644 --- a/firmware/buffer.c +++ b/firmware/buffer.c | |||
@@ -72,19 +72,22 @@ void *buffer_alloc(size_t size) | |||
72 | 72 | ||
73 | #ifdef BUFFER_ALLOC_DEBUG | 73 | #ifdef BUFFER_ALLOC_DEBUG |
74 | retval +=sizeof(struct buffer_start_marker); | 74 | retval +=sizeof(struct buffer_start_marker); |
75 | end=(struct buffer_end_marker*)(audiobuf - sizeof(struct buffer_end_marker)); | 75 | if(size>0) |
76 | if(end->magic == BUF_MAGIC) | ||
77 | { | 76 | { |
78 | end->last=0; | 77 | end=(struct buffer_end_marker*)(audiobuf - sizeof(struct buffer_end_marker)); |
79 | } | 78 | if(end->magic == BUF_MAGIC) |
80 | start=(struct buffer_start_marker*)audiobuf; | 79 | { |
81 | start->magic = BUF_MAGIC; | 80 | end->last=0; |
82 | start->buffer_size = size; | 81 | } |
83 | end=(struct buffer_end_marker*)(audiobuf+sizeof(struct buffer_start_marker)+size); | 82 | start=(struct buffer_start_marker*)audiobuf; |
84 | end->magic = BUF_MAGIC; | 83 | start->magic = BUF_MAGIC; |
85 | end->last = 1; | 84 | start->buffer_size = size; |
85 | end=(struct buffer_end_marker*)(audiobuf+sizeof(struct buffer_start_marker)+size); | ||
86 | end->magic = BUF_MAGIC; | ||
87 | end->last = 1; | ||
86 | 88 | ||
87 | audiobuf = ((unsigned char *)end) + sizeof(struct buffer_end_marker); | 89 | audiobuf = ((unsigned char *)end) + sizeof(struct buffer_end_marker); |
90 | } | ||
88 | 91 | ||
89 | logf("Alloc %x %d",(unsigned int)retval,size); | 92 | logf("Alloc %x %d",(unsigned int)retval,size); |
90 | #else /* !BUFFER_ALLOC_DEBUG */ | 93 | #else /* !BUFFER_ALLOC_DEBUG */ |