X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fdisable_events.c;h=0bfd0c506c850e4fedca383615c13d67365a7006;hp=290e72791e034fb8060ffda8cfd1e8c77ef5e9ea;hb=1004b7191b421c7c07acf964d0110d93bb022699;hpb=68c7f6e55254fd6e54d7bb4a6c1316bb77843a6e diff --git a/src/bin/lttng/commands/disable_events.c b/src/bin/lttng/commands/disable_events.c index 290e72791..0bfd0c506 100644 --- a/src/bin/lttng/commands/disable_events.c +++ b/src/bin/lttng/commands/disable_events.c @@ -1,18 +1,8 @@ /* - * Copyright (C) 2011 - David Goulet + * Copyright (C) 2011 David Goulet * - * 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 @@ -26,6 +16,7 @@ #include #include +#include #include "../command.h" @@ -116,7 +107,7 @@ const char *print_event_type(const enum lttng_event_type ev_type) * enabled is 0 or 1 * success is 0 or 1 */ -static int mi_print_event(char *event_name, int enabled, int success) +static int mi_print_event(const char *event_name, int enabled, int success) { int ret; @@ -236,7 +227,7 @@ static int disable_events(char *session_name) enabled = 0; success = 1; MSG("All %s events of type %s are disabled in channel %s", - get_domain_str(dom.type), + lttng_domain_type_str(dom.type), print_event_type(opt_event_type), print_channel_name(channel_name)); } @@ -275,7 +266,7 @@ static int disable_events(char *session_name) enabled = 1; } else { MSG("%s %s of type %s disabled in channel %s for session %s", - get_domain_str(dom.type), + lttng_domain_type_str(dom.type), event_name, print_event_type(opt_event_type), print_channel_name(channel_name), @@ -378,7 +369,9 @@ int cmd_disable_events(int argc, const char **argv) } ret = print_missing_or_multiple_domains( - opt_kernel + opt_userspace + opt_jul + opt_log4j + opt_python); + opt_kernel + opt_userspace + opt_jul + opt_log4j + + opt_python, + true); if (ret) { ret = CMD_ERROR; goto end;