X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracectl.c;h=8be2cd03228edcde4196f7d211623a5a36b14d4f;hb=7add38980ed134a423ff02bb553efcb5f930eda9;hp=b3dd4c207ab731953036f8c2f09518b39e93c40c;hpb=52c51a47e4b002d741c89de8dc786da59e894a1a;p=lttng-ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index b3dd4c20..8be2cd03 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -166,7 +166,7 @@ void process_blocked_consumers(void)
 
 				close(bc->fd_producer);
 
-				__list_del(bc->list.prev, bc->list.next);
+				list_del(&bc->list);
 
 				result = ustcomm_send_reply(&bc->server, "END", &bc->src);
 				if(result < 0) {
@@ -194,7 +194,7 @@ void process_blocked_consumers(void)
 			}
 			free(reply);
 
-			__list_del(bc->list.prev, bc->list.next);
+			list_del(&bc->list);
 		}
 	}
 
@@ -570,12 +570,13 @@ int listener_main(void *p)
 
 					result = ltt_do_put_subbuf(rbuf, lttbuf, consumed_old);
 					if(result < 0) {
-						WARN("ltt_do_put_subbuf: error");
+						WARN("ltt_do_put_subbuf: error (subbuf=%s)", channel_name);
+						asprintf(&reply, "%s", "ERROR", consumed_old);
 					}
 					else {
-						DBG("ltt_do_put_subbuf: success");
+						DBG("ltt_do_put_subbuf: success (subbuf=%s)", channel_name);
+						asprintf(&reply, "%s", "OK", consumed_old);
 					}
-					asprintf(&reply, "%s", "OK", consumed_old);
 
 					result = ustcomm_send_reply(&ustcomm_app.server, reply, &src);
 					if(result) {