mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH 2/4] perf tools: Separate out code setting ground colors from ui_browser__color_config
Date: Mon,  9 May 2016 20:41:47 +0900	[thread overview]
Message-ID: <1462794109-14652-3-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1462794109-14652-1-git-send-email-treeze.taeung@gmail.com>

ui_browser__color_config() set foreground and background
colors values in ui_browser__colorsets.
But it can be reused by other functions so make ui_browser__config_gcolors()
bringing it from ui_browser__color_config().

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/ui/browser.c | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index af68a9d..a477867 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -553,12 +553,33 @@ static struct ui_browser_colorset {
 	}
 };
 
+static int ui_browser__config_gcolors(struct ui_browser_colorset *ui_browser_color,
+				      const char *value)
+{
+	char *fg = NULL, *bg;
+
+	fg = strdup(value);
+	if (fg == NULL)
+		return -1;
+
+	bg = strchr(fg, ',');
+	if (bg == NULL) {
+		free(fg);
+		return -1;
+	}
+
+	*bg = '\0';
+	while (isspace(*++bg));
+
+	ui_browser_color->fg = fg;
+	ui_browser_color->bg = bg;
+	return 0;
+}
 
 static int ui_browser__color_config(const char *var, const char *value,
 				    void *data __maybe_unused)
 {
-	char *fg = NULL, *bg;
-	int i;
+	int i, ret;
 
 	/* same dir for all commands */
 	if (prefixcmp(var, "colors.") != 0)
@@ -570,23 +591,11 @@ static int ui_browser__color_config(const char *var, const char *value,
 		if (strcmp(ui_browser__colorsets[i].name, name) != 0)
 			continue;
 
-		fg = strdup(value);
-		if (fg == NULL)
-			break;
-
-		bg = strchr(fg, ',');
-		if (bg == NULL)
-			break;
-
-		*bg = '\0';
-		while (isspace(*++bg));
-		ui_browser__colorsets[i].bg = bg;
-		ui_browser__colorsets[i].fg = fg;
-		return 0;
+		ret = ui_browser__config_gcolors(&ui_browser__colorsets[i], value);
+		break;
 	}
 
-	free(fg);
-	return -1;
+	return ret;
 }
 
 void ui_browser__argv_seek(struct ui_browser *browser, off_t offset, int whence)
-- 
2.5.0

  parent reply	other threads:[~2016-05-09 11:42 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-09 11:41 [PATCH 0/4] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-05-09 11:41 ` [PATCH 1/4] perf config: Introduce default_config_item for all default config key-value pairs Taeung Song
2016-05-09 17:17   ` Arnaldo Carvalho de Melo
2016-05-10 11:49     ` Taeung Song
2016-05-10 15:05       ` Arnaldo Carvalho de Melo
2016-05-11 10:30         ` Taeung Song
2016-05-09 11:41 ` Taeung Song [this message]
2016-05-09 17:17   ` [PATCH 2/4] perf tools: Separate out code setting ground colors from ui_browser__color_config Arnaldo Carvalho de Melo
2016-05-10 11:33     ` Taeung Song
2016-05-09 11:41 ` [PATCH 3/4] perf config: Initialize ui_browser__colorsets with default config items Taeung Song
2016-05-09 17:19   ` Arnaldo Carvalho de Melo
2016-05-10 11:57     ` Taeung Song
2016-05-09 11:41 ` [PATCH 4/4] perf config: Initialize annotate_browser__opts " Taeung Song

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462794109-14652-3-git-send-email-treeze.taeung@gmail.com \
    --to=treeze.taeung@gmail.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®