From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Mon, 5 Jul 2010 13:55:17 +0000 (+0000)
Subject: Merged revisions 273886 via svnmerge from
X-Git-Tag: 1.6.2.11-rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=613ea571cf508eca308e94343841aea565040073;p=thirdparty%2Fasterisk.git

Merged revisions 273886 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r273886 | pabelanger | 2010-07-05 09:53:44 -0400 (Mon, 05 Jul 2010) | 15 lines

  Merged revisions 273884 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r273884 | pabelanger | 2010-07-05 09:51:29 -0400 (Mon, 05 Jul 2010) | 8 lines

    Remove extra line breaks from 'core show config mappings'

    (closes issue #17583)
    Reported by: pabelanger
    Patches:
          issue17583.patch uploaded by pabelanger (license 224)
    Tested by: lmadsen
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@273888 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/config.c b/main/config.c
index 5b8195a146..874a64d8a7 100644
--- a/main/config.c
+++ b/main/config.c
@@ -2442,9 +2442,8 @@ static char *handle_cli_core_show_config_mappings(struct ast_cli_entry *e, int c
 	if (!config_engine_list) {
 		ast_cli(a->fd, "No config mappings found.\n");
 	} else {
-		ast_cli(a->fd, "\n\n");
 		for (eng = config_engine_list; eng; eng = eng->next) {
-			ast_cli(a->fd, "\nConfig Engine: %s\n", eng->name);
+			ast_cli(a->fd, "Config Engine: %s\n", eng->name);
 			for (map = config_maps; map; map = map->next) {
 				if (!strcasecmp(map->driver, eng->name)) {
 					ast_cli(a->fd, "===> %s (db=%s, table=%s)\n", map->name, map->database,
@@ -2452,7 +2451,6 @@ static char *handle_cli_core_show_config_mappings(struct ast_cli_entry *e, int c
 				}
 			}
 		}
-		ast_cli(a->fd,"\n\n");
 	}
 	
 	ast_mutex_unlock(&config_lock);