perf: fix compiler warning in builtin_script.c:is_top_script()
PATCH 1/1 perf: fix compiler warning in builtin_script.c:is_top_script()
Fix annoying compiler warning in the is_top_script() function. The issue was that a const char * was cast into a char * to call ends_with(). We fix the users of ends_with() instead. Some are passing a char *, but it is okay to cast the return value of ends_with() to char * (because we understand what ends_with() does).
---
tools/perf/builtin-script.c +5 -5
@@ -397,10 +397,10 @@ out_delete_desc:return NULL ; } -static char *ends_with (char *str,const char *suffix) +static const char *ends_with (const char *str,const char *suffix) {size_t suffix_len =strlen (suffix); -char *p = str; +const char *p = str;if (strlen (str) > suffix_len) { p = str +strlen (str) - suffix_len;
@@ -492,7 +492,7 @@ static int list_available_scripts(const struct option *opt __used,for_each_script (lang_path, lang_dir, script_dirent, script_next) { script_root =strdup (script_dirent.d_name); - str =ends_with (script_root,REPORT_SUFFIX ); + str = (char *)ends_with (script_root,REPORT_SUFFIX );if (str) { *str ='\0' ; desc =script_desc__findnew (script_root);
@@ -540,7 +540,7 @@ static char *get_script_path(const char *script_root, const char *suffix)for_each_script (lang_path, lang_dir, script_dirent, script_next) { __script_root =strdup (script_dirent.d_name); - str =ends_with (__script_root, suffix); + str = (char *)ends_with (__script_root, suffix);if (str) { *str ='\0' ;if (strcmp (__script_root, script_root))
@@ -560,7 +560,7 @@ static char *get_script_path(const char *script_root, const char *suffix)static bool is_top_script (const char *script_path) { -return ends_with ((char *)script_path,"top" ) ==NULL ? false : true; +return ends_with (script_path,"top" ) ==NULL ? false : true; }static int has_required_arg (char *script_path)
[tip:perf/core] perf script: Fix compiler warning in builtin_script.c:is_top_script()
Commit-ID: 965bb6beaf70862d3846e330ea7a14996d82c499 Gitweb: http://git.kernel.org/tip/965bb6beaf70862d3846e330ea7a14996d82c499 Author: Stephane Eranian <[email protected]> AuthorDate: Fri, 3 Dec 2010 17:52:01 +0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 6 Dec 2010 12:44:27 -0200
perf script: Fix compiler warning in builtin_script.c:is_top_script()
Fix annoying compiler warning in the is_top_script() function.
The issue was that a const char * was cast into a char * to call ends_with(). We fix the users of ends_with() instead. Some are passing a char *, but it is okay to cast the return value of ends_with() to char * (because we understand what ends_with() does).
Cc: David S. Miller <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Robert Richter <[email protected]>
Cc: Stephane Eranian <[email protected]>
LKML-Reference: <[email protected]>
--- tools/perf/builtin-script.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/builtin-script.c +5 -5
@@ -387,10 +387,10 @@ out_delete_desc:return NULL ; } -static char *ends_with (char *str,const char *suffix) +static const char *ends_with (const char *str,const char *suffix) {size_t suffix_len =strlen (suffix); -char *p = str; +const char *p = str;if (strlen (str) > suffix_len) { p = str +strlen (str) - suffix_len;
@@ -482,7 +482,7 @@ static int list_available_scripts(const struct option *opt __used,for_each_script (lang_path, lang_dir, script_dirent, script_next) { script_root =strdup (script_dirent.d_name); - str =ends_with (script_root,REPORT_SUFFIX ); + str = (char *)ends_with (script_root,REPORT_SUFFIX );if (str) { *str ='\0' ; desc =script_desc__findnew (script_root);
@@ -530,7 +530,7 @@ static char *get_script_path(const char *script_root, const char *suffix)for_each_script (lang_path, lang_dir, script_dirent, script_next) { __script_root =strdup (script_dirent.d_name); - str =ends_with (__script_root, suffix); + str = (char *)ends_with (__script_root, suffix);if (str) { *str ='\0' ;if (strcmp (__script_root, script_root))
@@ -550,7 +550,7 @@ static char *get_script_path(const char *script_root, const char *suffix)static bool is_top_script (const char *script_path) { -return ends_with ((char *)script_path,"top" ) ==NULL ? false : true; +return ends_with (script_path,"top" ) ==NULL ? false : true; }static int has_required_arg (char *script_path)