Skip to content

Commit

Permalink
tracing, function tracer: Clean up strstrip() usage
Browse files Browse the repository at this point in the history
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@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Nov 23, 2009
1 parent 98e4833 commit 457dc92
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions kernel/trace/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -3391,4 +3391,3 @@ void ftrace_graph_stop(void)
ftrace_stop();
}
#endif

0 comments on commit 457dc92

Please sign in to comment.