perf ui: Move ui_helpline routines to separate file in util/ui/
Commit-ID: 5575536fc7ad7577a4e687a13e2f49acebc519f3 Gitweb: http://git.kernel.org/tip/5575536fc7ad7577a4e687a13e2f49acebc519f3 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sun, 8 Aug 2010 19:48:31 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 10 Aug 2010 16:08:51 -0300
perf ui: Move ui_helpline routines to separate file in util/ui/
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/Makefile | 2 + tools/perf/util/newt.c | 38 +----------------------------------- tools/perf/util/ui/helpline.c | 43 +++++++++++++++++++++++++++++++++++++++++ tools/perf/util/ui/helpline.h | 9 ++++++++ 4 files changed, 55 insertions(+), 37 deletions(-)
tools/perf/Makefile +2 -0
@@ -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
tools/perf/util/newt.c +1 -37
@@ -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;
tools/perf/util/ui/helpline.c new file +43 -0
43 lines not on this page · raw message
tools/perf/util/ui/helpline.h new file +9 -0
@@ -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_ */