X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-comm.c;h=d60126f4dd981c18097996611c497ffe9b8d712d;hp=5205a67aef3dd26ed16ff9324901627addd19ba9;hb=ed959a6dda949363fc33942b143efa1f7f4f7f39;hpb=7e5e41764d9b3626942d187ee498bd8bd81a5a18

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index 5205a67a..d60126f4 100644
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -38,6 +38,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>
@@ -133,7 +134,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 +263,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 +277,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 = strndup(hostname, MAXNAMLEN);
+	relay_session->name = strndup(session_name, MAXNAMLEN);
 	relay_session->clients = clients;
 	relay_session->streams = streams;
 	relay_session->timer = timer;
@@ -351,8 +352,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,
@@ -381,13 +382,13 @@ int lttng_live_ctf_trace_assign(struct lttng_live_viewer_stream *stream,
 	int ret = 0;
 
 	trace = g_hash_table_lookup(stream->session->ctf_traces,
-			(gpointer) ctf_trace_id);
+			&ctf_trace_id);
 	if (!trace) {
 		trace = g_new0(struct lttng_live_ctf_trace, 1);
 		trace->ctf_trace_id = ctf_trace_id;
 		trace->streams = g_ptr_array_new();
 		g_hash_table_insert(stream->session->ctf_traces,
-				(gpointer) ctf_trace_id,
+				&trace->ctf_trace_id,
 				trace);
 	}
 	if (stream->metadata_flag)