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) | |
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) strdup_bufsize = filesize(fd); strdup_handle = core_alloc_ex("filetypes", strdup_bufsize, &ops); - if (strdup_handle <= 0) + if (strdup_handle < 0) return; read_builtin_types(); 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) sizeof( pix_t ) * bmph.width * bmph.height; int hid; - while (!(hid = rb->buflib_alloc(&buf_ctx, size)) && free_slide_prio(prio)); + do { + hid = rb->buflib_alloc(&buf_ctx, size); + } while (hid < 0 && free_slide_prio(prio)); - if (!hid) { + if (hid < 0) { rb->close( fh ); return 0; } 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) return -1; scrobbler_cache = core_alloc("scrobbler", SCROBBLER_MAX_CACHE*SCROBBLER_CACHE_LEN); - if (scrobbler_cache <= 0) + if (scrobbler_cache < 0) { logf("SCROOBLER: OOM"); return -1; |