[asterisk-commits] irroot: branch irroot/distrotech-customers-10 r335061 - in /team/irroot/distr...

[SVN commits to the Asterisk project]

Author: irroot
Date: Fri Sep  9 07:09:18 2011
New Revision: 335061

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335061
Log:
Merged revisions 335014 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r335014 | irroot | 2011-09-09 09:23:53 +0200 (Fri, 09 Sep 2011) | 9 lines
  
  
  Move code for VALID_EXTEN from app_readexten to func_dialplan
  
  Mark VALID_EXTEN deprecated.
  
  Review: https://reviewboard.asterisk.org/r/1396/
........

Modified:
    team/irroot/distrotech-customers-10/   (props changed)
    team/irroot/distrotech-customers-10/CHANGES
    team/irroot/distrotech-customers-10/apps/app_readexten.c
    team/irroot/distrotech-customers-10/funcs/func_dialplan.c

Propchange: team/irroot/distrotech-customers-10/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  9 07:09:18 2011
@@ -1,1 +1,1 @@
-/branches/10:1-334967
+/branches/10:1-335060

Modified: team/irroot/distrotech-customers-10/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/CHANGES?view=diff&rev=335061&r1=335060&r2=335061
==============================================================================
--- team/irroot/distrotech-customers-10/CHANGES (original)
+++ team/irroot/distrotech-customers-10/CHANGES Fri Sep  9 07:09:18 2011
@@ -121,6 +121,7 @@
    for a given string to replace with another string as many times as the
    user specifies or just throughout the whole string.
  * Added option to CHANNEL(pickupgroup) allow reading and setting the pickupgroup of channel.
+ * Mark VALID_EXTEN() deprecated in favor of DIALPLAN_EXISTS()
 
 libpri channel driver (chan_dahdi) DAHDI changes
 --------------------------

Modified: team/irroot/distrotech-customers-10/apps/app_readexten.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/apps/app_readexten.c?view=diff&rev=335061&r1=335060&r2=335061
==============================================================================
--- team/irroot/distrotech-customers-10/apps/app_readexten.c (original)
+++ team/irroot/distrotech-customers-10/apps/app_readexten.c Fri Sep  9 07:09:18 2011
@@ -265,7 +265,7 @@
 static int unload_module(void)
 {
 	int res = ast_unregister_application(app);
-	return res;	
+	return res;
 }
 
 static int load_module(void)

Modified: team/irroot/distrotech-customers-10/funcs/func_dialplan.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-10/funcs/func_dialplan.c?view=diff&rev=335061&r1=335060&r2=335061
==============================================================================
--- team/irroot/distrotech-customers-10/funcs/func_dialplan.c (original)
+++ team/irroot/distrotech-customers-10/funcs/func_dialplan.c Fri Sep  9 07:09:18 2011
@@ -67,12 +67,13 @@
 		<description>
 			<para>Returns a true value if the indicated <replaceable>context</replaceable>,
 			<replaceable>extension</replaceable>, and <replaceable>priority</replaceable> exist.</para>
+			<warning><para>This function has been deprecated in favor of the <literal>DIALPLAN_EXISTS()</literal> function</para></warning>
 		</description>
 	</function>
  ***/
 
-static int isexten_function_read(struct ast_channel *chan, const char *cmd, char *data, 
-	char *buf, size_t len) 
+static int isexten_function_read(struct ast_channel *chan, const char *cmd, char *data,
+	char *buf, size_t len)
 {
 	char *parse;
 	AST_DECLARE_APP_ARGS(args,
@@ -119,7 +120,7 @@
 		ast_log(LOG_ERROR, "Invalid arguments provided to DIALPLAN_EXISTS\n");
 		return -1;
 	}
-	
+
 	return 0;
 }