[asterisk-commits] russell: trunk r86835 - /trunk/apps/app_playback.c

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Mon Oct 22 16:17:17 CDT 2007


Author: russell
Date: Mon Oct 22 16:17:16 2007
New Revision: 86835

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86835
Log:
Convert some spaces to tabs and make it so the CLI command is only registered
once instead of 3 times.

(closes issue #11053)
Reported by: seanbright
Patches:
      app_playback.patch uploaded by seanbright (license 71)

Modified:
    trunk/apps/app_playback.c

Modified: trunk/apps/app_playback.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_playback.c?view=diff&rev=86835&r1=86834&r2=86835
==============================================================================
--- trunk/apps/app_playback.c (original)
+++ trunk/apps/app_playback.c Mon Oct 22 16:17:16 2007
@@ -357,7 +357,6 @@
 	return 0;
 }
 
-
 static char *__say_cli_init(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	const char *old_mode = say_api_buf[0] ? say_new : say_old;
@@ -368,11 +367,11 @@
 		e->usage = 
 			"Usage: say load [new|old]\n"
 			"       say load\n"
-			"	   Report status of current say mode\n"
+			"           Report status of current say mode\n"
 			"       say load new\n"
-			"          Set say method, configured in say.conf\n"
+			"           Set say method, configured in say.conf\n"
 			"       say load old\n"
-			"          Set old say metod, coded in asterisk core\n";
+			"           Set old say method, coded in asterisk core\n";
 		return NULL;
 	case CLI_GENERATE:
 		return NULL;
@@ -380,24 +379,20 @@
 	if (a->argc == 2) {
 		ast_cli(a->fd, "say mode is [%s]\n", old_mode);
 		return CLI_SUCCESS;
-        } else if (a->argc != 3)
-                return CLI_SHOWUSAGE;
-        mode = a->argv[2];
-	
-	if (!strcmp(mode, old_mode)) {
+	} else if (a->argc != 3)
+		return CLI_SHOWUSAGE;
+	mode = a->argv[2];
+	if (!strcmp(mode, old_mode))
 		ast_log(LOG_NOTICE, "say mode is %s already\n", mode);
-	} else {
-		if (say_init_mode(mode) == 0) {
+	else
+		if (say_init_mode(mode) == 0)
 			ast_log(LOG_NOTICE, "init say.c from %s to %s\n", old_mode, mode);
-		}
-	}
+
 	return CLI_SUCCESS;
 }
 
 static struct ast_cli_entry cli_playback[] = {
 	AST_CLI_DEFINE(__say_cli_init, "Set or show the say mode"),
-	AST_CLI_DEFINE(__say_cli_init, "Set the say mode"),
-	AST_CLI_DEFINE(__say_cli_init, "Set the say mode"),
 };
 
 static int playback_exec(struct ast_channel *chan, void *data)




More information about the asterisk-commits mailing list