Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf ui: Move ui_helpline routines to separate file in util/ui/

Browse source 
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2010-08-08 19:48:31 -03:00
parent d247eb6b92
commit 5575536fc7
4 changed files with 55 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/perf/Makefile
View file

@ -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

38
tools/perf/util/newt.c
View file

@ -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;

43
tools/perf/util/ui/helpline.c Normal file
View file

@ -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);
}

9
tools/perf/util/ui/helpline.h Normal file
View file

@ -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_ */