Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 21 insertions, 5 deletions

diff --git a/tools/perf/util/ui/util.c b/tools/perf/util/ui/util.c
index 04600e26ceea..fdf1fc8f08bc 100644
--- a/tools/perf/util/ui/util.c
+++ b/tools/perf/util/ui/util.c
@@ -9,10 +9,9 @@
 #include "../debug.h"
 #include "browser.h"
 #include "helpline.h"
+#include "ui.h"
 #include "util.h"
 
-newtComponent newt_form__new(void);
-
 static void newt_form__set_exit_keys(newtComponent self)
 {
         newtFormAddHotKey(self, NEWT_KEY_LEFT);
@@ -22,7 +21,7 @@ static void newt_form__set_exit_keys(newtComponent self)
         newtFormAddHotKey(self, CTRL('c'));
 }
 
-newtComponent newt_form__new(void)
+static newtComponent newt_form__new(void)
 {
         newtComponent self = newtForm(NULL, NULL, 0);
         if (self)
@@ -106,9 +105,26 @@ out_destroy_form:
         return rc;
 }
 
+static const char yes[] = "Yes", no[] = "No",
+                  warning_str[] = "Warning!", ok[] = "Ok";
+
 bool ui__dialog_yesno(const char *msg)
 {
         /* newtWinChoice should really be accepting const char pointers... */
-        char yes[] = "Yes", no[] = "No";
-        return newtWinChoice(NULL, yes, no, (char *)msg) == 1;
+        return newtWinChoice(NULL, (char *)yes, (char *)no, (char *)msg) == 1;
+}
+
+void ui__warning(const char *format, ...)
+{
+        va_list args;
+
+        va_start(args, format);
+        if (use_browser > 0) {
+                pthread_mutex_lock(&ui__lock);
+                newtWinMessagev((char *)warning_str, (char *)ok,
+                                (char *)format, args);
+                pthread_mutex_unlock(&ui__lock);
+        } else
+                vfprintf(stderr, format, args);
+        va_end(args);
 }