[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-457dc928f586f3f4b930206965e6db270034e97e@git.kernel.org>
Date: Mon, 23 Nov 2009 11:53:14 GMT
From: tip-bot for Ingo Molnar <mingo@...e.hu>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, acme@...hat.com, paulus@...ba.org,
hpa@...or.com, mingo@...hat.com, a.p.zijlstra@...llo.nl,
efault@....de, fweisbec@...il.com, rostedt@...dmis.org,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:tracing/core] tracing, function tracer: Clean up strstrip() usage
Commit-ID: 457dc928f586f3f4b930206965e6db270034e97e
Gitweb: http://git.kernel.org/tip/457dc928f586f3f4b930206965e6db270034e97e
Author: Ingo Molnar <mingo@...e.hu>
AuthorDate: Mon, 23 Nov 2009 11:03:28 +0100
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 23 Nov 2009 11:04:07 +0100
tracing, function tracer: Clean up strstrip() usage
Clean up strstrip() usage - which also addresses this build warning:
kernel/trace/ftrace.c: In function 'ftrace_pid_write':
kernel/trace/ftrace.c:3004: warning: ignoring return value of 'strstrip', declared with attribute warn_unused_result
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Mike Galbraith <efault@....de>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
kernel/trace/ftrace.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 7f9b51e..1dc101d 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -2985,7 +2985,7 @@ static ssize_t
ftrace_pid_write(struct file *filp, const char __user *ubuf,
size_t cnt, loff_t *ppos)
{
- char buf[64];
+ char buf[64], *tmp;
long val;
int ret;
@@ -3001,11 +3001,11 @@ ftrace_pid_write(struct file *filp, const char __user *ubuf,
* Allow "echo > set_ftrace_pid" or "echo -n '' > set_ftrace_pid"
* to clean the filter quietly.
*/
- strstrip(buf);
- if (strlen(buf) == 0)
+ tmp = strstrip(buf);
+ if (strlen(tmp) == 0)
return 1;
- ret = strict_strtol(buf, 10, &val);
+ ret = strict_strtol(tmp, 10, &val);
if (ret < 0)
return ret;
@@ -3391,4 +3391,3 @@ void ftrace_graph_stop(void)
ftrace_stop();
}
#endif
-
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists