X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-comm.c;h=8509377c271014e2b7d0a27328e419ce66f08698;hp=a44516de6fc05306b2461710483e971fd6ccf19d;hb=91bb00241890871495cac25ae8becfc67105e421;hpb=3730724040e3a09c58c15f387bd8fff47dc12eb4

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index a44516de..8509377c 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -26,7 +26,6 @@
 #include <netinet/in.h>
 #include <netdb.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
@@ -38,6 +37,7 @@
 #include <babeltrace/ctf/ctf-index.h>
 
 #include <babeltrace/babeltrace.h>
+#include <babeltrace/endian.h>
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/ctf/callbacks.h>
 #include <babeltrace/ctf/iterator.h>
@@ -51,6 +51,8 @@
 #include <formats/ctf/events-private.h>
 
 #include <babeltrace/compat/memstream.h>
+#include <babeltrace/compat/send.h>
+#include <babeltrace/compat/string.h>
 
 #include "lttng-live.h"
 #include "lttng-viewer-abi.h"
@@ -102,7 +104,7 @@ ssize_t lttng_live_send(int fd, const void *buf, size_t len)
 	ssize_t ret;
 
 	do {
-		ret = send(fd, buf, len, MSG_NOSIGNAL);
+		ret = bt_send_nosigpipe(fd, buf, len);
 	} while (ret < 0 && errno == EINTR);
 	return ret;
 }
@@ -133,7 +135,7 @@ int lttng_live_connect_viewer(struct lttng_live_ctx *ctx)
 	server_addr.sin_family = AF_INET;
 	server_addr.sin_port = htons(ctx->port);
 	server_addr.sin_addr = *((struct in_addr *) host->h_addr);
-	bzero(&(server_addr.sin_zero), 8);
+	memset(&(server_addr.sin_zero), 0, 8);
 
 	if (connect(ctx->control_sock, (struct sockaddr *) &server_addr,
 				sizeof(struct sockaddr)) == -1) {
@@ -262,9 +264,9 @@ void update_session_list(GPtrArray *session_list, char *hostname,
 
 	for (i = 0; i < session_list->len; i++) {
 		relay_session = g_ptr_array_index(session_list, i);
-		if ((strncmp(relay_session->hostname, hostname, NAME_MAX) == 0) &&
+		if ((strncmp(relay_session->hostname, hostname, MAXNAMLEN) == 0) &&
 				strncmp(relay_session->name,
-					session_name, NAME_MAX) == 0) {
+					session_name, MAXNAMLEN) == 0) {
 			relay_session->streams += streams;
 			if (relay_session->clients < clients)
 				relay_session->clients = clients;
@@ -276,8 +278,8 @@ void update_session_list(GPtrArray *session_list, char *hostname,
 		return;
 
 	relay_session = g_new0(struct lttng_live_relay_session, 1);
-	relay_session->hostname = strndup(hostname, NAME_MAX);
-	relay_session->name = strndup(session_name, NAME_MAX);
+	relay_session->hostname = bt_strndup(hostname, MAXNAMLEN);
+	relay_session->name = bt_strndup(session_name, MAXNAMLEN);
 	relay_session->clients = clients;
 	relay_session->streams = streams;
 	relay_session->timer = timer;
@@ -351,8 +353,8 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
 					be32toh(lsession.live_timer));
 		} else {
 			if ((strncmp(lsession.session_name, ctx->session_name,
-				NAME_MAX) == 0) && (strncmp(lsession.hostname,
-					ctx->traced_hostname, NAME_MAX) == 0)) {
+				MAXNAMLEN) == 0) && (strncmp(lsession.hostname,
+					ctx->traced_hostname, MAXNAMLEN) == 0)) {
 				printf_verbose("Reading from session %" PRIu64 "\n",
 						session_id);
 				g_array_append_val(ctx->session_ids,
@@ -930,8 +932,10 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
 		}
 	} while (ret > 0 || !len_read);
 
-	if (fclose(metadata_stream->metadata_fp_write))
-		perror("fclose");
+	if (babeltrace_close_memstream(metadata_buf, &size,
+			metadata_stream->metadata_fp_write)) {
+		perror("babeltrace_close_memstream");
+	}
 	metadata_stream->metadata_fp_write = NULL;
 
 error:
@@ -1116,7 +1120,7 @@ int handle_seek_position(size_t index, int whence,
 		struct ctf_stream_pos *pos,
 		struct ctf_file_stream *file_stream)
 {
-	int ret;
+	int ret = 0;
 
 	switch (whence) {
 	case SEEK_CUR: