X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=2b8c8d3e3d8e947789aa32c049403204948c1dc9;hp=e96fed36bc2146a1eed39a879581d0a5298c5fbc;hb=4fa8cb43454bc7e6d958433b1524fdc2f455f2ad;hpb=a547c6b5cf58abbfd8afd46a661cc4a9fe6f3214

diff --git a/grab_client.c b/grab_client.c
index e96fed36..2b8c8d3e 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -76,7 +76,7 @@ static int gc_write(struct grab_client *gc, char *buf, size_t len)
 		if (gc->mode == GM_SLOPPY)
 			return len;
 	}
-	ret = write_nonblock(gc->fd, buf, len);
+	ret = xwrite(gc->fd, buf, len);
 	if (ret < 0)
 		goto err;
 	if (ret > 0)
@@ -166,9 +166,7 @@ void activate_grab_clients(struct sched *s)
 
 static int gc_close(struct grab_client *gc, int err)
 {
-	btr_remove_node(gc->btrn);
-	btr_free_node(gc->btrn);
-	gc->btrn = NULL;
+	btr_remove_node(&gc->btrn);
 	PARA_INFO_LOG("closing gc: %s\n", para_strerror(-err));
 	list_move(&gc->node, &inactive_grab_client_list);
 	if (err == -E_GC_WRITE || (gc->flags & GF_ONE_SHOT)) {