Cleanup: always use sysconf to get the page size

[lttng-tools.git] / src / bin / lttng / commands / disable_channels.c

diff --git a/src/bin/lttng/commands/disable_channels.c b/src/bin/lttng/commands/disable_channels.c
index 936884e1fc430c79da4ec98b79e24ff8f555fdc3..cf9f20bb6d3fd2a539651c6c08d6a09699ca68c5 100644 (file)
--- a/src/bin/lttng/commands/disable_channels.c
+++ b/src/bin/lttng/commands/disable_channels.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
@@ -23,9 +13,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <assert.h>
 
 #include <common/mi-lttng.h>
+#include <lttng/domain-internal.h>
 
 #include "../command.h"
 
@@ -64,8 +54,8 @@ static int mi_partial_channel_print(char *channel_name, unsigned int enabled,
 {
        int ret;
 
-       assert(writer);
-       assert(channel_name);
+       LTTNG_ASSERT(writer);
+       LTTNG_ASSERT(channel_name);
 
        /* Open channel element */
        ret = mi_lttng_writer_open_element(writer, config_element_channel);
@@ -122,7 +112,7 @@ static int disable_channels(char *session_name)
                dom.type = LTTNG_DOMAIN_UST;
        } else {
                /* Checked by the caller. */
-               assert(0);
+               abort();
        }
 
        handle = lttng_create_handle(session_name, &dom);
@@ -165,7 +155,8 @@ static int disable_channels(char *session_name)
 
                } else {
                        MSG("%s channel %s disabled for session %s",
-                                       get_domain_str(dom.type), channel_name, session_name);
+                                       lttng_domain_type_str(dom.type),
+                                       channel_name, session_name);
                        enabled = 0;
                        success = 1;
                }
@@ -238,7 +229,8 @@ int cmd_disable_channels(int argc, const char **argv)
                }
        }
 
-       ret = print_missing_or_multiple_domains(opt_kernel + opt_userspace);
+       ret = print_missing_or_multiple_domains(
+                       opt_kernel + opt_userspace, false);
        if (ret) {
                ret = CMD_ERROR;
                goto end;