aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-script.c
diff options
context:
space:
mode:
authorStephane Eranian <eranian@google.com>2010-12-03 10:52:01 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2010-12-06 09:44:27 -0500
commit965bb6beaf70862d3846e330ea7a14996d82c499 (patch)
treee4a24575429fd2432ef75fdb25d94f7e4d91b6cc /tools/perf/builtin-script.c
parentcbf41645f35224798cb61641766e6a16e141ffe4 (diff)
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 <davem@davemloft.net> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Robert Richter <robert.richter@amd.com> Cc: Stephane Eranian <eranian@gmail.com> LKML-Reference: <4cf92096.17edd80a.1540.5d60@mx.google.com> Signed-off-by: Stephane Eranian <eranian@google.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r--tools/perf/builtin-script.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 683a30572cc5..54f1ea808db5 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -387,10 +387,10 @@ out_delete_desc:
387 return NULL; 387 return NULL;
388} 388}
389 389
390static char *ends_with(char *str, const char *suffix) 390static const char *ends_with(const char *str, const char *suffix)
391{ 391{
392 size_t suffix_len = strlen(suffix); 392 size_t suffix_len = strlen(suffix);
393 char *p = str; 393 const char *p = str;
394 394
395 if (strlen(str) > suffix_len) { 395 if (strlen(str) > suffix_len) {
396 p = str + strlen(str) - suffix_len; 396 p = str + strlen(str) - suffix_len;
@@ -482,7 +482,7 @@ static int list_available_scripts(const struct option *opt __used,
482 482
483 for_each_script(lang_path, lang_dir, script_dirent, script_next) { 483 for_each_script(lang_path, lang_dir, script_dirent, script_next) {
484 script_root = strdup(script_dirent.d_name); 484 script_root = strdup(script_dirent.d_name);
485 str = ends_with(script_root, REPORT_SUFFIX); 485 str = (char *)ends_with(script_root, REPORT_SUFFIX);
486 if (str) { 486 if (str) {
487 *str = '\0'; 487 *str = '\0';
488 desc = script_desc__findnew(script_root); 488 desc = script_desc__findnew(script_root);
@@ -530,7 +530,7 @@ static char *get_script_path(const char *script_root, const char *suffix)
530 530
531 for_each_script(lang_path, lang_dir, script_dirent, script_next) { 531 for_each_script(lang_path, lang_dir, script_dirent, script_next) {
532 __script_root = strdup(script_dirent.d_name); 532 __script_root = strdup(script_dirent.d_name);
533 str = ends_with(__script_root, suffix); 533 str = (char *)ends_with(__script_root, suffix);
534 if (str) { 534 if (str) {
535 *str = '\0'; 535 *str = '\0';
536 if (strcmp(__script_root, script_root)) 536 if (strcmp(__script_root, script_root))
@@ -550,7 +550,7 @@ static char *get_script_path(const char *script_root, const char *suffix)
550 550
551static bool is_top_script(const char *script_path) 551static bool is_top_script(const char *script_path)
552{ 552{
553 return ends_with((char *)script_path, "top") == NULL ? false : true; 553 return ends_with(script_path, "top") == NULL ? false : true;
554} 554}
555 555
556static int has_required_arg(char *script_path) 556static int has_required_arg(char *script_path)