projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng: incorrect domain list printed when no domain is provided
[lttng-tools.git]
/
src
/
bin
/
lttng
/
utils.c
diff --git
a/src/bin/lttng/utils.c
b/src/bin/lttng/utils.c
index 885f498b73c72340dedc99ae67a3ca5d226ed8ab..f48ac745326d956433360f6e1f268cad131a5130 100644
(file)
--- 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.
*/
* 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;
if (ret < 0) {
/* Not found. */
ret = 0;
@@
-404,15
+404,19
@@
error_socket:
return ret;
}
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;
{
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;
ret = -1;
- } else if (
sum
> 1) {
- ERR("
Multiple domains
specified.");
+ } else if (
domain_count
> 1) {
+ ERR("
Only one domain must be
specified.");
ret = -1;
}
ret = -1;
}
This page took
0.024546 seconds
and
4
git commands to generate.