X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=sync_filter.c;h=b4710f6704ce7a4fbd03567d806ce633df164008;hp=3174a4ef741b0afe1107ff6bd9146f1c82f5f77e;hb=HEAD;hpb=5967ac5353739c3ff571dd12d4c6814fa8493ad8

diff --git a/sync_filter.c b/sync_filter.c
index 3174a4ef..20db1b1d 100644
--- a/sync_filter.c
+++ b/sync_filter.c
@@ -102,7 +102,7 @@ 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));
+	ctx = fn->private_data = zalloc(sizeof(*ctx));
 	init_list_head(&ctx->buddies);
 
 	/* create socket to listen for incoming packets */
@@ -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,7 @@ success:
 	ret = -E_SYNC_COMPLETE; /* success */
 	goto out;
 fail:
-	if (ret != -E_BTR_EOF)
+	if (ret != -E_EOF)
 		PARA_WARNING_LOG("%s\n", para_strerror(-ret));
 out:
 	sync_close_buddies(ctx);