Rename buffer tree node field of struct receiver_node.
authorAndre Noll <maan@systemlinux.org>
Mon, 28 Dec 2009 21:54:30 +0000 (22:54 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 28 Dec 2009 21:54:30 +0000 (22:54 +0100)
http_recv.c
recv.c
recv.h

index b1d3f5f..f7796d4 100644 (file)
@@ -134,7 +134,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        }
        if (conf->buffer_tree_given) {
                char *buf;
-               if (btr_bytes_pending(rn->btr_root) > HTTP_RECV_MAX_PENDING) {
+               if (btr_bytes_pending(rn->btrn) > HTTP_RECV_MAX_PENDING) {
                        t->error = -E_HTTP_RECV_OVERRUN;
                        return;
                }
@@ -146,7 +146,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                        free(buf);
                        return;
                }
-               btr_add_output(buf, t->error, rn->btr_root);
+               btr_add_output(buf, t->error, rn->btrn);
                return;
        }
        t->error = -E_HTTP_RECV_OVERRUN;
diff --git a/recv.c b/recv.c
index e04f648..1bb0532 100644 (file)
--- a/recv.c
+++ b/recv.c
@@ -92,7 +92,7 @@ int main(int argc, char *argv[])
        }
        r = &receivers[receiver_num];
        rn.receiver = r;
-       rn.btr_root = btr_new_node("receiver", NULL /* no parent */);
+       rn.btrn = btr_new_node("receiver", NULL /* no parent */);
        ret = r->open(&rn);
        if (ret < 0)
                goto out;
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
        ret = schedule(&s);
 out:
        if (r_opened) {
-               btr_del_node(rn.btr_root);
+               btr_del_node(rn.btrn);
                r->close(&rn);
        }
        if (r)
diff --git a/recv.h b/recv.h
index 101df82..fc617a3 100644 (file)
--- a/recv.h
+++ b/recv.h
@@ -25,7 +25,7 @@ struct receiver_node {
        /** The task associated with this instance. */
        struct task task;
        /** The receiver node is always the root of the buffer tree. */
-       struct btr_node *btr_root;
+       struct btr_node *btrn;
 };
 
 /**