From a8c68bfb4b3955e3c6da3f227e35888485e62d18 Mon Sep 17 00:00:00 2001
From: Nicolas Pennequin <nicolas@nicolas-laptop.(none)>
Date: Fri, 5 Oct 2007 18:04:07 +0200
Subject: [PATCH] A few comment tweaks

---
 apps/buffering.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/buffering.c b/apps/buffering.c
index 1687c49b8..0c82fd856 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -386,8 +386,8 @@ static ssize_t buffer_handle(int handle_id)
         ret += rc;
         h->filerem -= rc;
 
-        /* DEBUGF("buffer_handle: buffered %ld bytes. done: %ld. remaining: %ld.\n",
-               rc, h->available, h->filerem); */
+        /* DEBUGF("buffer_handle(%d): buffered %ld bytes. done: %ld. remaining: %ld.\n",
+               h->id, rc, h->available, h->filerem); */
     }
 
     if (h->filerem == 0) {
@@ -565,7 +565,7 @@ int bufopen(char *file, size_t offset, enum data_type type)
     struct memory_handle *h = add_handle(&size);
     if (!h)
     {
-        DEBUGF("failed to add handle\n");
+        DEBUGF("bufopen: failed to add handle\n");
         close(fd);
         return -2;
     }
@@ -582,7 +582,7 @@ int bufopen(char *file, size_t offset, enum data_type type)
     h->available = 0;
     h->type = type;
 
-    DEBUGF("allocated %ld bytes. ID: %d\n", size, h->id);
+    DEBUGF("bufopen: allocated %ld bytes. ID: %d\n", size, h->id);
 
     if (type == TYPE_CODEC || type == TYPE_CUESHEET || type == TYPE_IMAGE) {
         /* Immediately buffer those */
@@ -611,9 +611,11 @@ int bufalloc(void *src, size_t size, enum data_type type)
     if (!can_add_handle())
         return -2;
 
-    if (size + sizeof(struct memory_handle) > buffer_len - buf_widx)
+    if (size + sizeof(struct memory_handle) > buffer_len - buf_widx) {
         /* The data would need to wrap. */
+        DEBUGF("bufalloc: data wrap\n");
         return -2;
+    }
 
     size_t allocsize = size;
     struct memory_handle *h = add_handle(&allocsize);
@@ -623,6 +625,7 @@ int bufalloc(void *src, size_t size, enum data_type type)
 
     if (src) {
         if (type == TYPE_ID3 && size == sizeof(struct mp3entry)) {
+            DEBUGF("bufalloc: allocating metadata\n");
             /* specially take care of struct mp3entry */
             copy_mp3entry((struct mp3entry *)&buffer[buf_widx],
                           (struct mp3entry *)src);
@@ -713,20 +716,25 @@ int bufadvance(int handle_id, off_t offset)
     if (offset >= 0)
     {
         /* check for access beyond what's available */
-        if ((size_t)offset > (h->available - RINGBUF_SUB(h->ridx, h->data)))
+        if ((size_t)offset > (h->available - RINGBUF_SUB(h->ridx, h->data))) {
+            DEBUGF("bufadvance: failed, access after data\n");
             return -2;
+        }
 
         h->ridx = RINGBUF_ADD(h->ridx, offset);
     }
     else
     {
         /* check for access before what's available */
-        if ((size_t)(-offset) > RINGBUF_SUB(h->ridx, h->data))
+        if ((size_t)(-offset) > RINGBUF_SUB(h->ridx, h->data)) {
+            DEBUGF("bufadvance: failed, access before data\n");
             return -2;
+        }
 
         h->ridx = RINGBUF_SUB(h->ridx, (size_t)(-offset));
     }
 
+    //DEBUGF("bufadvance: %ld\n", (long)offset);
     return 0;
 }
 
-- 
2.11.4.GIT