Rename buffer tree node field of struct receiver_node.

diff --git a/http_recv.c b/http_recv.c
index b1d3f5f3d7d23924303d79cf60fbd07fd69fc6e9..f7796d4a6a090d9966b02d262f4f3bb3abec30ad 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -134,7 +134,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        }
        if (conf->buffer_tree_given) {
                char *buf;
        }
        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;
                }
                        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;
                }
                        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;
                return;
        }
        t->error = -E_HTTP_RECV_OVERRUN;

diff --git a/recv.c b/recv.c
index e04f6484981a9659fe399d9df4066c06ca6dab2b..1bb0532a9f51622e645bd69074b19504be9068f6 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;
        }
        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;
        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) {
        ret = schedule(&s);
 out:
        if (r_opened) {

-               btr_del_node(rn.btr_root);
+               btr_del_node(rn.btrn);

                r->close(&rn);
        }
        if (r)
                r->close(&rn);
        }
        if (r)

diff --git a/recv.h b/recv.h
index 101df82418b9897e33ae44fc31242a3743790175..fc617a3e8ac54ac3bc3d48e96398e0635d194a13 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. */
        /** 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;

 };
 
 /**
 };
 
 /**