diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-09-07 23:16:29 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-09-07 23:16:29 +0000 |
commit | 5296af838c39b8b7c4b00a3c896345f9e0719dcf (patch) | |
tree | e3e31a974f23bd4cd810c00b892c1eabaec4c676 /apps | |
parent | 6a989b8d4dec4750ad474598bd52897381d2f3cb (diff) | |
download | rockbox-5296af838c39b8b7c4b00a3c896345f9e0719dcf.tar.gz rockbox-5296af838c39b8b7c4b00a3c896345f9e0719dcf.zip |
Buflib: Clarification about invalid handles
* Enhance allocation function comments to better state the return value and what an invalid value is
* Change clients to check for "< 0" instead of "<= 0" or "== 0"
* Return -1 or -2 depending on the exact failure in buflib_alloc_ex.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30469 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/filetypes.c | 2 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 6 | ||||
-rw-r--r-- | apps/scrobbler.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/apps/filetypes.c b/apps/filetypes.c index 942ff329fe..8f2e91222a 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c | |||
@@ -344,7 +344,7 @@ void filetype_init(void) | |||
344 | 344 | ||
345 | strdup_bufsize = filesize(fd); | 345 | strdup_bufsize = filesize(fd); |
346 | strdup_handle = core_alloc_ex("filetypes", strdup_bufsize, &ops); | 346 | strdup_handle = core_alloc_ex("filetypes", strdup_bufsize, &ops); |
347 | if (strdup_handle <= 0) | 347 | if (strdup_handle < 0) |
348 | return; | 348 | return; |
349 | read_builtin_types(); | 349 | read_builtin_types(); |
350 | read_config(fd); | 350 | read_config(fd); |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index c13aca1a95..a572586886 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -1520,9 +1520,11 @@ int read_pfraw(char* filename, int prio) | |||
1520 | sizeof( pix_t ) * bmph.width * bmph.height; | 1520 | sizeof( pix_t ) * bmph.width * bmph.height; |
1521 | 1521 | ||
1522 | int hid; | 1522 | int hid; |
1523 | while (!(hid = rb->buflib_alloc(&buf_ctx, size)) && free_slide_prio(prio)); | 1523 | do { |
1524 | hid = rb->buflib_alloc(&buf_ctx, size); | ||
1525 | } while (hid < 0 && free_slide_prio(prio)); | ||
1524 | 1526 | ||
1525 | if (!hid) { | 1527 | if (hid < 0) { |
1526 | rb->close( fh ); | 1528 | rb->close( fh ); |
1527 | return 0; | 1529 | return 0; |
1528 | } | 1530 | } |
diff --git a/apps/scrobbler.c b/apps/scrobbler.c index 78414f3d88..06c957cd6c 100644 --- a/apps/scrobbler.c +++ b/apps/scrobbler.c | |||
@@ -255,7 +255,7 @@ int scrobbler_init(void) | |||
255 | return -1; | 255 | return -1; |
256 | 256 | ||
257 | scrobbler_cache = core_alloc("scrobbler", SCROBBLER_MAX_CACHE*SCROBBLER_CACHE_LEN); | 257 | scrobbler_cache = core_alloc("scrobbler", SCROBBLER_MAX_CACHE*SCROBBLER_CACHE_LEN); |
258 | if (scrobbler_cache <= 0) | 258 | if (scrobbler_cache < 0) |
259 | { | 259 | { |
260 | logf("SCROOBLER: OOM"); | 260 | logf("SCROOBLER: OOM"); |
261 | return -1; | 261 | return -1; |