[svn-commits] rmudgett: trunk r321331 - in /trunk: ./ CHANGES apps/app_privacy.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Fri May 27 16:34:04 2011
New Revision: 321331

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

........
  r321330 | rmudgett | 2011-05-27 16:31:25 -0500 (Fri, 27 May 2011) | 8 lines
  
  The app_privacy args have undocumented "options" position, interferes with "context" position.
  
  * Add documention for unused "options" position to match existing code.
  The trunk(v1.10) version will remove the unused options position.
  
  (closes issue #19273)
  Reported by: mdavenport
........

Modified:
    trunk/   (props changed)
    trunk/CHANGES
    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=321331&r1=321330&r2=321331
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Fri May 27 16:34:04 2011
@@ -133,6 +133,10 @@
  * 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/apps/app_privacy.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_privacy.c?view=diff&rev=321331&r1=321330&r2=321331
==============================================================================
--- trunk/apps/app_privacy.c (original)
+++ trunk/apps/app_privacy.c Fri May 27 16:34:04 2011
@@ -92,8 +92,10 @@
 	AST_DECLARE_APP_ARGS(args,
 		AST_APP_ARG(maxretries);
 		AST_APP_ARG(minlength);
+		AST_APP_ARG(checkcontext);
+
+		/* This must be last in the list until we actually have some options again. :) */
 		AST_APP_ARG(options);
-		AST_APP_ARG(checkcontext);
 	);
 
 	if (chan->caller.id.number.valid