From 955307ef9f6eb1cb19e285229d72e8ee8b0d3146 Mon Sep 17 00:00:00 2001
From: Automerge script <automerge@asterisk.org>
Date: Mon, 10 Dec 2012 02:20:30 +0000
Subject: [PATCH] Merged revisions 377506,377512 via svnmerge from
 file:///srv/subversion/repos/asterisk/trunk

................
  r377506 | tilghman | 2012-12-09 19:29:32 -0600 (Sun, 09 Dec 2012) | 11 lines

  Remove some dead code and additionally handle a case that wasn't handled.
  ........

  Merged revisions 377487 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 377504 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377505 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r377512 | tilghman | 2012-12-09 19:41:50 -0600 (Sun, 09 Dec 2012) | 22 lines

  Improve documentation by making all of the colors used readable,
  no matter what the background color is.

  Dark blue on a black background is unreadable, as is yellow on a
  light background.  This patch turns on the bright attribute for
  colors when on a dark background and turns *off* the bright
  attribute when the -W command line option is used (indicating a
  _light_ background).  This ensures that text is readable in both
  cases.

  Patch by: tilghman
  Review: https://reviewboard.asterisk.org/r/2224
  ........

  Merged revisions 377509 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

  Merged revisions 377510 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377511 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377535 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 addons/cdr_mysql.c | 11 ++++++++---
 main/xmldoc.c      |  8 +++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/addons/cdr_mysql.c b/addons/cdr_mysql.c
index 445f9e3d05..b87d8c6aa1 100644
--- a/addons/cdr_mysql.c
+++ b/addons/cdr_mysql.c
@@ -430,6 +430,9 @@ static int my_load_module(int reload)
 	int res;
 	struct ast_config *cfg;
 	struct ast_variable *var;
+	/* CONFIG_STATUS_FILEUNCHANGED is impossible when config_flags is always 0,
+	 * and it has to be zero, so a reload can be sent to tell the driver to
+	 * rescan the table layout. */
 	struct ast_flags config_flags = { 0 };
 	struct column *entry;
 	char *temp;
@@ -445,11 +448,13 @@ static int my_load_module(int reload)
 	 * have changed, which is not detectable by config file change detection,
 	 * but should still cause the configuration to be re-parsed. */
 	cfg = ast_config_load(config, config_flags);
-	if (!cfg) {
+	if (cfg == CONFIG_STATUS_FILEMISSING) {
 		ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config);
 		return AST_MODULE_LOAD_SUCCESS;
-	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
-		return AST_MODULE_LOAD_SUCCESS;
+	} else if (cfg == CONFIG_STATUS_FILEINVALID) {
+		ast_log(LOG_ERROR, "Unable to load configuration file '%s'\n", config);
+		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	if (reload) {
 		AST_RWLIST_WRLOCK(&columns);
diff --git a/main/xmldoc.c b/main/xmldoc.c
index 56f1c74f01..225ed66110 100644
--- a/main/xmldoc.c
+++ b/main/xmldoc.c
@@ -358,7 +358,13 @@ char *ast_xmldoc_printable(const char *bwinput, int withcolors)
 
 			/* Setup color */
 			if (withcolors) {
-				ast_term_color_code(&colorized, colorized_tags[c].colorfg, 0);
+				if (ast_opt_light_background) {
+					/* Turn off *bright* colors */
+					ast_term_color_code(&colorized, colorized_tags[c].colorfg & 0x7f, 0);
+				} else {
+					/* Turn on *bright* colors */
+					ast_term_color_code(&colorized, colorized_tags[c].colorfg | 0x80, 0);
+				}
 				if (!colorized) {
 					return NULL;
 				}
-- 
GitLab