X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.c;h=61718e54d2414ace10097f5d3b558fddc086a4ad;hb=159b042f34366d0fde5dcd73b4231c558922a664;hp=fa2d3c9da626542fc9a0d1bb78bdf017197eedd1;hpb=4f00620d66e81d89a546b29a774dad49d38983b3;p=lttng-tools.git

diff --git a/src/bin/lttng/utils.c b/src/bin/lttng/utils.c
index fa2d3c9da..61718e54d 100644
--- a/src/bin/lttng/utils.c
+++ b/src/bin/lttng/utils.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -159,7 +149,7 @@ unsigned int fls_u32(uint32_t x)
 #define HAS_FLS_U32
 #endif
 
-#if defined(__x86_64)
+#if defined(__x86_64) && defined(__LP64__)
 static inline
 unsigned int fls_u64(uint64_t x)
 {
@@ -442,15 +432,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;
 	}