X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=sync_filter.c;h=d322395df87fdc556332ca642ea1d54e9bcc2bd9;hb=27c08870ba172782f6406045007b6ff32a4f7329;hp=2ca2a657de6a79cb9b9e9ee3be47789e11f48e05;hpb=2031b9cab9304b02c0372f73eef54d9501277031;p=paraslash.git

diff --git a/sync_filter.c b/sync_filter.c
index 2ca2a657..d322395d 100644
--- a/sync_filter.c
+++ b/sync_filter.c
@@ -102,8 +102,8 @@ static void sync_open(struct filter_node *fn)
 	unsigned buddy_given;
 	const struct lls_opt_result *r_b;
 
-	ctx = fn->private_data = para_calloc(sizeof(*ctx));
-	INIT_LIST_HEAD(&ctx->buddies);
+	ctx = fn->private_data = zalloc(sizeof(*ctx));
+	init_list_head(&ctx->buddies);
 
 	/* create socket to listen for incoming packets */
 	ret = makesock(
@@ -148,7 +148,7 @@ static void sync_open(struct filter_node *fn)
 			close(fd);
 			goto fail;
 		}
-		buddy = para_malloc(sizeof(*buddy));
+		buddy = alloc(sizeof(*buddy));
 		buddy->fd = fd;
 		buddy->sbi = sbi + i;
 		buddy->ping_received = false;
@@ -176,12 +176,12 @@ static void *sync_setup(const struct lls_parse_result *lpr)
 
 	r_b = FILTER_CMD_OPT_RESULT(SYNC, BUDDY, lpr);
 	n = lls_opt_given(r_b);
-	sbi = para_malloc(n * sizeof(*sbi));
+	sbi = arr_alloc(n, sizeof(*sbi));
 	PARA_INFO_LOG("initializing buddy info array of length %u\n", n);
 	for (i = 0; i < n; i++) {
 		const char *url = lls_string_val(i, r_b);
 		size_t len = strlen(url);
-		char *host = para_malloc(len + 1);
+		char *host = alloc(len + 1);
 		int port;
 		struct addrinfo *ai;
 
@@ -365,7 +365,8 @@ success:
 	ret = -E_SYNC_COMPLETE; /* success */
 	goto out;
 fail:
-	PARA_WARNING_LOG("%s\n", para_strerror(-ret));
+	if (ret != -E_BTR_EOF)
+		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
 out:
 	sync_close_buddies(ctx);
 	btr_splice_out_node(&fn->btrn);