forked from Minki/linux
1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
62 lines
954 B
C
62 lines
954 B
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "../debug.h"
|
|
#include "helpline.h"
|
|
#include "ui.h"
|
|
|
|
char ui_helpline__current[512];
|
|
|
|
static void nop_helpline__pop(void)
|
|
{
|
|
}
|
|
|
|
static void nop_helpline__push(const char *msg __maybe_unused)
|
|
{
|
|
}
|
|
|
|
static struct ui_helpline default_helpline_fns = {
|
|
.pop = nop_helpline__pop,
|
|
.push = nop_helpline__push,
|
|
};
|
|
|
|
struct ui_helpline *helpline_fns = &default_helpline_fns;
|
|
|
|
void ui_helpline__pop(void)
|
|
{
|
|
helpline_fns->pop();
|
|
}
|
|
|
|
void ui_helpline__push(const char *msg)
|
|
{
|
|
helpline_fns->push(msg);
|
|
}
|
|
|
|
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);
|
|
}
|