liblttctl: switch_timer for all channels fix

[ltt-control.git] / liblttctl / liblttctl.c

diff --git a/liblttctl/liblttctl.c b/liblttctl/liblttctl.c
index e9f4f180e0728e52ccf76f7902ca4a65d5c8db48..1032f15660019608b5682e4e41180591db31a5d2 100644 (file)
--- a/liblttctl/liblttctl.c
+++ b/liblttctl/liblttctl.c
@@ -1,23 +1,25 @@
-/* libltt
+/*
+ * liblttctl
  *
- * Linux Trace Toolkit Netlink Control Library
+ * Linux Trace Toolkit Control Library
  *
  * Controls the ltt-control kernel module through debugfs.
  *
- * Copyright 2005 -
- *     Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
+ * Copyright (c) 2005-2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
@@ -443,6 +445,7 @@ static int __lttctl_set_channel_enable(const char *name, const char *channel,
 
        return ret;
 }
+
 int lttctl_set_channel_enable(const char *name, const char *channel,
                int enable)
 {
@@ -639,6 +642,7 @@ static int __lttctl_set_channel_subbuf_size(const char *name,
        ret = lttctl_sendop(ctlfname, opstr);
        if (ret)
                fprintf(stderr, "Set channel's subbuf size failed\n");
+       return ret;
 }
 
 int lttctl_set_channel_subbuf_size(const char *name, const char *channel,
@@ -706,6 +710,7 @@ static int __lttctl_set_channel_switch_timer(const char *name,
        ret = lttctl_sendop(ctlfname, opstr);
        if (ret)
                fprintf(stderr, "Set channel's switch timer failed\n");
+       return ret;
 }
 
 int lttctl_set_channel_switch_timer(const char *name, const char *channel,
@@ -726,7 +731,7 @@ int lttctl_set_channel_switch_timer(const char *name, const char *channel,
                goto arg_error;
 
        if (strcmp(channel, "all")) {
-               ret = __lttctl_set_channel_subbuf_size(name, channel,
+               ret = __lttctl_set_channel_switch_timer(name, channel,
                        switch_timer);
                if (ret)
                        goto op_err;