perf ui: Complete the breakdown of util/newt.c
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c
index 783d277..5b01df6 100644
--- a/tools/perf/util/ui/browsers/annotate.c
+++ b/tools/perf/util/ui/browsers/annotate.c
@@ -86,7 +86,7 @@
return -1;
if (hist_entry__annotate(self, &head) < 0) {
- ui__error_window(browser__last_msg);
+ ui__error_window(ui_helpline__last_msg);
return -1;
}
diff --git a/tools/perf/util/ui/browsers/hists.c b/tools/perf/util/ui/browsers/hists.c
index 9d32a41..cee7998 100644
--- a/tools/perf/util/ui/browsers/hists.c
+++ b/tools/perf/util/ui/browsers/hists.c
@@ -17,10 +17,6 @@
#include "../util.h"
#include "map.h"
-int ui__help_window(const char *text);
-bool dialog_yesno(const char *msg);
-int popup_menu(int argc, char * const argv[]);
-
struct hist_browser {
struct ui_browser b;
struct hists *hists;
@@ -798,7 +794,7 @@
}
if (is_exit_key(key)) {
if (key == NEWT_KEY_ESCAPE &&
- !dialog_yesno("Do you really want to exit?"))
+ !ui__dialog_yesno("Do you really want to exit?"))
continue;
break;
}
@@ -842,7 +838,7 @@
options[nr_options++] = (char *)"Exit";
- choice = popup_menu(nr_options, options);
+ choice = ui__popup_menu(nr_options, options);
for (i = 0; i < nr_options - 1; ++i)
free(options[i]);