perf annotate: Don't die() when finding an invalid config option

Commit-ID:  f06cff7c59b6b252d667435d7baad48687b41002
Gitweb:     http://git.kernel.org/tip/f06cff7c59b6b252d667435d7baad48687b41002
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 22 Oct 2015 18:10:52 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 22 Oct 2015 18:10:52 -0300

perf annotate: Don't die() when finding an invalid config option

The perf_config() infrastructure we inherited from git calls die() when the provided config callback returns -1, meaning some key in a config section is unexpected, that seems ok for a stdio based tool, but in --tui we end up messing up the output, so just tell the user about the error, wait for a keystroke and return 0, being more resilient and proceeding with what we managed to parse.

That die() needs to die, tho :-)

---
 tools/perf/ui/browsers/annotate.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

index ba72e01..d4d7cc2 100644
@@ -1152,9 +1152,9 @@ static int annotate__config(const char *var, const char *value,
 		      sizeof(struct annotate_config), annotate_config__cmp);
 
 	if (cfg == NULL)
-		return -1;
-
-	*cfg->value = perf_config_bool(name, value);
+		ui__warning("%s variable unknown, ignoring...", var);
+	else
+		*cfg->value = perf_config_bool(name, value);
 	return 0;
 }