X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-comm.c;h=442ca892c3b13dd10c7cb5e8447cf53677b00445;hb=6ba0c2b259f1f99ed3ce8ee2e58e90bc393b704e;hp=2f96167e419601bf48e75c3ccc87f4b65a606ffa;hpb=fca97dfd73a96bbf964c39e7f3a21fe70cccee96;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index 2f96167e..442ca892 100644
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -357,24 +357,6 @@ static int got_timeout_env;
 
 static char *get_map_shm(struct sock_info *sock_info);
 
-ssize_t lttng_ust_read(int fd, void *buf, size_t len)
-{
-	ssize_t ret;
-	size_t copied = 0, to_copy = len;
-
-	do {
-		ret = read(fd, buf + copied, to_copy);
-		if (ret > 0) {
-			copied += ret;
-			to_copy -= ret;
-		}
-	} while ((ret > 0 && to_copy > 0)
-		|| (ret < 0 && errno == EINTR));
-	if (ret > 0) {
-		ret = copied;
-	}
-	return ret;
-}
 /*
  * Returns the HOME directory path. Caller MUST NOT free(3) the returned
  * pointer.
@@ -639,7 +621,7 @@ void get_allow_blocking(void)
 }
 
 static
-int register_to_sessiond(int socket, enum ustctl_socket_type type)
+int register_to_sessiond(int socket, enum lttng_ust_ctl_socket_type type)
 {
 	return ustcomm_send_reg_msg(socket,
 		type,
@@ -1877,7 +1859,7 @@ restart:
 		sock_info->root_handle = ret;
 	}
 
-	ret = register_to_sessiond(sock_info->socket, USTCTL_SOCKET_CMD);
+	ret = register_to_sessiond(sock_info->socket, LTTNG_UST_CTL_SOCKET_CMD);
 	if (ret < 0) {
 		ERR("Error registering to %s ust cmd socket",
 			sock_info->name);
@@ -1970,7 +1952,7 @@ restart:
 	}
 
 	ret = register_to_sessiond(sock_info->notify_socket,
-			USTCTL_SOCKET_NOTIFY);
+			LTTNG_UST_CTL_SOCKET_NOTIFY);
 	if (ret < 0) {
 		ERR("Error registering to %s ust notify socket",
 			sock_info->name);