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

Commit 7c3102b8 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf ui browsers: Fix usage of __ in struct names 



In tools/perf we use a convention where __ separates the struct name
from the function name for functions that operate on a struct instance.

Fix this usage by removing it from the struct names and fix also the
associated functions.

Acked-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-rfj7acng5tukftb8hy1rrw08@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5c6ccc37

tools/perf/ui/browser.c

+2 −2
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *browser) 
	return row;

}



static struct ui_browser__colorset {

static struct ui_browser_colorset {

	const char *name, *fg, *bg;

	int colorset;

} ui_browser__colorsets[] = {
@@ -706,7 +706,7 @@ void ui_browser__init(void) 
	perf_config(ui_browser__color_config, NULL);



	while (ui_browser__colorsets[i].name) {

		struct ui_browser__colorset *c = &ui_browser__colorsets[i++];

		struct ui_browser_colorset *c = &ui_browser__colorsets[i++];

		sltt_set_color(c->colorset, c->name, c->fg, c->bg);

	}

tools/perf/ui/browsers/annotate.c

+4 −4
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, 
/*

 * Keep the entries sorted, they are bsearch'ed

 */

static struct annotate__config {

static struct annotate_config {

	const char *name;

	bool *value;

} annotate__configs[] = {
@@ -940,7 +940,7 @@ static struct annotate__config { 


static int annotate_config__cmp(const void *name, const void *cfgp)

{

	const struct annotate__config *cfg = cfgp;

	const struct annotate_config *cfg = cfgp;



	return strcmp(name, cfg->name);

}
@@ -948,7 +948,7 @@ static int annotate_config__cmp(const void *name, const void *cfgp) 
static int annotate__config(const char *var, const char *value,

			    void *data __maybe_unused)

{

	struct annotate__config *cfg;

	struct annotate_config *cfg;

	const char *name;



	if (prefixcmp(var, "annotate.") != 0)
@@ -956,7 +956,7 @@ static int annotate__config(const char *var, const char *value, 


	name = var + 9;

	cfg = bsearch(name, annotate__configs, ARRAY_SIZE(annotate__configs),

		      sizeof(struct annotate__config), annotate_config__cmp);

		      sizeof(struct annotate_config), annotate_config__cmp);



	if (cfg == NULL)

		return -1;