diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-08-08 19:48:31 -0300 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2010-08-10 16:08:51 -0300 |
commit | 5575536fc7ad7577a4e687a13e2f49acebc519f3 (patch) | |
tree | 9cba0637a9fa243b78be5f1083deff11a27f45e9 /tools | |
parent | d247eb6b924bbc2f13748c89b6c72c7a3d46645c (diff) | |
download | linux-5575536fc7ad7577a4e687a13e2f49acebc519f3.tar.gz linux-5575536fc7ad7577a4e687a13e2f49acebc519f3.tar.bz2 linux-5575536fc7ad7577a4e687a13e2f49acebc519f3.zip |
perf ui: Move ui_helpline routines to separate file in util/ui/
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Makefile | 2 | ||||
-rw-r--r-- | tools/perf/util/newt.c | 38 | ||||
-rw-r--r-- | tools/perf/util/ui/helpline.c | 43 | ||||
-rw-r--r-- | tools/perf/util/ui/helpline.h | 9 |
4 files changed, 55 insertions, 37 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index d5bce768b4bf..d77a101ab7dd 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -569,7 +569,9 @@ else EXTLIBS += -lnewt -lslang LIB_OBJS += $(OUTPUT)util/newt.o LIB_OBJS += $(OUTPUT)util/ui/browser.o + LIB_OBJS += $(OUTPUT)util/ui/helpline.o LIB_H += util/ui/browser.h + LIB_H += util/ui/helpline.h endif endif diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c index 9768be31f9c5..23f3b7d31bff 100644 --- a/tools/perf/util/newt.c +++ b/tools/perf/util/newt.c @@ -24,6 +24,7 @@ #include "sort.h" #include "symbol.h" #include "ui/browser.h" +#include "ui/helpline.h" #if SLANG_VERSION < 20104 #define slsmg_printf(msg, args...) SLsmg_printf((char *)msg, ##args) @@ -94,43 +95,6 @@ void ui_progress__delete(struct ui_progress *self) free(self); } -static void ui_helpline__pop(void) -{ - newtPopHelpLine(); -} - -static void ui_helpline__push(const char *msg) -{ - newtPushHelpLine(msg); -} - -static void ui_helpline__vpush(const char *fmt, va_list ap) -{ - char *s; - - if (vasprintf(&s, fmt, ap) < 0) - vfprintf(stderr, fmt, ap); - else { - ui_helpline__push(s); - free(s); - } -} - -static void ui_helpline__fpush(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - ui_helpline__vpush(fmt, ap); - va_end(ap); -} - -static void ui_helpline__puts(const char *msg) -{ - ui_helpline__pop(); - ui_helpline__push(msg); -} - static int ui_entry__read(const char *title, char *bf, size_t size, int width) { struct newtExitStruct es; diff --git a/tools/perf/util/ui/helpline.c b/tools/perf/util/ui/helpline.c new file mode 100644 index 000000000000..6a11e1301559 --- /dev/null +++ b/tools/perf/util/ui/helpline.c @@ -0,0 +1,43 @@ +#define _GNU_SOURCE +#include <stdio.h> +#include <stdlib.h> +#include <newt.h> + +#include "helpline.h" + +void ui_helpline__pop(void) +{ + newtPopHelpLine(); +} + +void ui_helpline__push(const char *msg) +{ + newtPushHelpLine(msg); +} + +static void ui_helpline__vpush(const char *fmt, va_list ap) +{ + char *s; + + if (vasprintf(&s, fmt, ap) < 0) + vfprintf(stderr, fmt, ap); + else { + ui_helpline__push(s); + free(s); + } +} + +void ui_helpline__fpush(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + ui_helpline__vpush(fmt, ap); + va_end(ap); +} + +void ui_helpline__puts(const char *msg) +{ + ui_helpline__pop(); + ui_helpline__push(msg); +} diff --git a/tools/perf/util/ui/helpline.h b/tools/perf/util/ui/helpline.h new file mode 100644 index 000000000000..56d8c1d8ffc8 --- /dev/null +++ b/tools/perf/util/ui/helpline.h @@ -0,0 +1,9 @@ +#ifndef _PERF_UI_HELPLINE_H_ +#define _PERF_UI_HELPLINE_H_ 1 + +void ui_helpline__pop(void); +void ui_helpline__push(const char *msg); +void ui_helpline__fpush(const char *fmt, ...); +void ui_helpline__puts(const char *msg); + +#endif /* _PERF_UI_HELPLINE_H_ */ |