Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5575536f authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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



LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d247eb6b

tools/perf/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#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);

}

tools/perf/util/ui/helpline.h

0 → 100644
+9 −0
Original line number Diff line number Diff line 
#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_ */