[svn-commits] pabelanger: branch 1.6.2 r273888 - in /branches/1.6.2: ./ main/config.c

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Mon Jul  5 08:55:17 2010
New Revision: 273888

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=273888
Log:
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
  ........
................

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/config.c

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/main/config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/config.c?view=diff&rev=273888&r1=273887&r2=273888
==============================================================================
--- branches/1.6.2/main/config.c (original)
+++ branches/1.6.2/main/config.c Mon Jul  5 08:55:17 2010
@@ -2442,9 +2442,8 @@
 	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 @@
 				}
 			}
 		}
-		ast_cli(a->fd,"\n\n");
 	}
 	
 	ast_mutex_unlock(&config_lock);