X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Flib%2Flttng-ctl%2Flttng-ctl.c;h=ef288726a23b1c97779097d4e0ce9bddbf00589c;hp=3bef3b6d71a1e46c22883428382dbd247910b6d2;hb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;hpb=ad20f4747b375cf21623ece9f76c9a9b54c493bb

diff --git a/src/lib/lttng-ctl/lttng-ctl.c b/src/lib/lttng-ctl/lttng-ctl.c
index 3bef3b6d7..ef288726a 100644
--- a/src/lib/lttng-ctl/lttng-ctl.c
+++ b/src/lib/lttng-ctl/lttng-ctl.c
@@ -524,7 +524,7 @@ static int ask_sessiond_varlen(struct lttcomm_session_msg *lsm,
 	}
 
 	/* Check error code if OK */
-	if (llm.ret_code != LTTCOMM_OK) {
+	if (llm.ret_code != LTTNG_OK) {
 		ret = -llm.ret_code;
 		goto end;
 	}
@@ -1041,18 +1041,13 @@ int lttng_list_tracepoint_fields(struct lttng_handle *handle,
  */
 const char *lttng_strerror(int code)
 {
-	/* lttcomm error codes range from -LTTCOMM_OK down to -LTTCOMM_NR */
-	if (code > -LTTCOMM_OK) {
-		return "Ended with errors";
-	}
-
-	return lttcomm_get_readable_code(code);
+	return error_get_str(code);
 }
 
 /*
  * Create a brand new session using name and url for destination.
  *
- * Returns LTTCOMM_OK on success or a negative error code.
+ * Returns LTTNG_OK on success or a negative error code.
  */
 int lttng_create_session(const char *name, const char *url)
 {
@@ -1072,7 +1067,7 @@ int lttng_create_session(const char *name, const char *url)
 	/* There should never be a data URL */
 	size = parse_str_urls_to_uri(url, NULL, &uris);
 	if (size < 0) {
-		return LTTCOMM_INVALID;
+		return LTTNG_ERR_INVALID;
 	}
 
 	lsm.u.uri.size = size;
@@ -1351,7 +1346,7 @@ int lttng_set_consumer_url(struct lttng_handle *handle,
 
 	size = parse_str_urls_to_uri(control_url, data_url, &uris);
 	if (size < 0) {
-		return LTTCOMM_INVALID;
+		return LTTNG_ERR_INVALID;
 	}
 
 	lsm.u.uri.size = size;
@@ -1543,7 +1538,7 @@ int _lttng_create_session_ext(const char *name, const char *url,
 	/* There should never be a data URL */
 	size = parse_str_urls_to_uri(url, NULL, &uris);
 	if (size < 0) {
-		return LTTCOMM_INVALID;
+		return LTTNG_ERR_INVALID;
 	}
 
 	lsm.u.uri.size = size;