X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=buffer_tree.c;h=05cdfa83630004e49561f0c7bef0138bd0a35c27;hb=9055c71be97f1095dcdbd83da305b600f204f763;hp=b80e707a5e432fba824a8e660ca66009c47d0427;hpb=610cb53b94af8e95326cd44b7845f35cffdb6bf3;p=paraslash.git

diff --git a/buffer_tree.c b/buffer_tree.c
index b80e707a..05cdfa83 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -307,7 +307,7 @@ out:
  */
 static struct btr_buffer *new_btrb(char *buf, size_t size)
 {
-	struct btr_buffer *btrb = para_calloc(sizeof(*btrb));
+	struct btr_buffer *btrb = zalloc(sizeof(*btrb));
 
 	btrb->buf = buf;
 	btrb->size = size;
@@ -354,7 +354,7 @@ static void add_btrb_to_children(struct btr_buffer *btrb,
 	if (btrn->start.tv_sec == 0)
 		btrn->start = *now;
 	FOR_EACH_CHILD(ch, btrn) {
-		struct btr_buffer_reference *br = para_calloc(sizeof(*br));
+		struct btr_buffer_reference *br = zalloc(sizeof(*br));
 		br->btrb = btrb;
 		br->consumed = consumed;
 		list_add_tail(&br->node, &ch->input_queue);
@@ -570,7 +570,7 @@ bool btr_no_parent(struct btr_node *btrn)
  * buffer.
  *
  * Since the buffer tree may change at any time, this function should be called
- * during each post_select call.
+ * during each post_monitor call.
  *
  * \return True if \a btrn has no siblings.
  */
@@ -1012,7 +1012,7 @@ next:
 			buf1, sz1, buf2, sz2, buf, sz);
 		memcpy(buf, buf1, sz1);
 		memcpy(buf + sz1, buf2, sz2);
-		br = para_calloc(sizeof(*br));
+		br = zalloc(sizeof(*br));
 		br->btrb = new_btrb(buf, sz);
 		br->btrb->refcount = 1;
 		br->consumed = 0;
@@ -1073,7 +1073,7 @@ static int merge_input(struct btr_node *btrn)
 	memcpy(buf, bufs[0], szs[0]);
 	memcpy(buf + szs[0], bufs[1], szs[1]);
 
-	br = para_calloc(sizeof(*br));
+	br = zalloc(sizeof(*br));
 	br->btrb = new_btrb(buf, sz);
 	br->btrb->refcount = 1;
 
@@ -1181,7 +1181,7 @@ struct btr_node *btr_search_node(const char *name, struct btr_node *root)
  * \param type The supposed type of \a btrn.
  *
  * Most users of the buffer tree subsystem call this function from both
- * their pre_select and the post_select methods.
+ * their ->pre_monitor() and ->post_monitor() methods.
  *
  * \return Negative if an error condition was detected, zero if there
  * is nothing to do and positive otherwise.