[asterisk-commits] rmudgett: trunk r321338 - in /trunk: ./ CHANGES UPGRADE.txt apps/app_privacy.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri May 27 17:09:03 2011
New Revision: 321338

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

Also revert -r321331 and -r321332.

........
  r321337 | rmudgett | 2011-05-27 17:06:43 -0500 (Fri, 27 May 2011) | 7 lines
  
  The app_privacy args have undocumented "options" position, interferes with "context" position.
  
  * Add documention for unused "options" position to match existing code.
  
  (closes issue #19273)
  Reported by: mdavenport
........

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    trunk/UPGRADE.txt
    trunk/apps/app_privacy.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=321338&r1=321337&r2=321338
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri May 27 17:09:03 2011
@@ -133,10 +133,6 @@
  * An autoservice is now started by default for pbx_lua channels.  It can be
    stopped and restarted using the autoservice_stop() and autoservice_start()
    functions.
-
-PrivacyManager
---------------------------
- * Removed unused options position since there are no more options defined.
 
 ------------------------------------------------------------------------------
 --- Functionality changes from Asterisk 1.6.2 to Asterisk 1.8 ----------------

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=321338&r1=321337&r2=321338
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Fri May 27 17:09:03 2011
@@ -50,8 +50,5 @@
  - the autoservice now defaults to being on by default
  - autoservice_start() and autoservice_start() no longer return a value.
 
-PrivacyManager:
- - Removed unused options position since there are no more options defined.
-
 ===========================================================
 ===========================================================

Modified: trunk/apps/app_privacy.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_privacy.c?view=diff&rev=321338&r1=321337&r2=321338
==============================================================================
--- trunk/apps/app_privacy.c (original)
+++ trunk/apps/app_privacy.c Fri May 27 17:09:03 2011
@@ -52,6 +52,9 @@
 			</parameter>
 			<parameter name="minlength">
 				<para>Minimum allowable digits in the input callerid number. Defaults to <literal>10</literal>.</para>
+			</parameter>
+			<parameter name="options">
+				<para>Position reserved for options.</para>
 			</parameter>
 			<parameter name="context">
 				<para>Context to check the given callerid against patterns.</para>
@@ -92,10 +95,8 @@
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(maxretries);
 		AST_APP_ARG(minlength);
+		AST_APP_ARG(options);
 		AST_APP_ARG(checkcontext);
-
-		/* This must be last in the list until we actually have some options again. :) */
-		AST_APP_ARG(options);
 	);
 
 	if (chan->caller.id.number.valid