X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=f48ac745326d956433360f6e1f268cad131a5130;hb=7f9bbb9186ad8c7efc7209c44dd1689a338c63dc;hp=885f498b73c72340dedc99ae67a3ca5d226ed8ab;hpb=9c9de14893f9f683850ac6ffc3af3c6cce4826de;p=lttng-tools.git diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c index 885f498b7..f48ac7453 100644 --- a/src/bin/lttng/utils.c +++ b/src/bin/lttng/utils.c @@ -387,7 +387,7 @@ int check_relayd(void) * A successful connect means the relayd exists thus returning 0 else a * negative value means it does NOT exists. */ - ret = connect(fd, &sin, sizeof(sin)); + ret = connect(fd, (struct sockaddr *) &sin, sizeof(sin)); if (ret < 0) { /* Not found. */ ret = 0; @@ -404,15 +404,19 @@ error_socket: return ret; } -int print_missing_or_multiple_domains(unsigned int sum) +int print_missing_or_multiple_domains(unsigned int domain_count, + bool include_agent_domains) { int ret = 0; - if (sum == 0) { - ERR("Please specify a domain (-k/-u/-j)."); + if (domain_count == 0) { + ERR("Please specify a domain (--kernel/--userspace%s).", + include_agent_domains ? + "/--jul/--log4j/--python" : + ""); ret = -1; - } else if (sum > 1) { - ERR("Multiple domains specified."); + } else if (domain_count > 1) { + ERR("Only one domain must be specified."); ret = -1; }