[asterisk-commits] dbrooks: branch 1.6.1 r199996 - in /branches/1.6.1: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: dbrooks
Date: Wed Jun 10 15:35:05 2009
New Revision: 199996

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=199996
Log:
Fixes the argument order in definition of new_find_extension().

In the definition of new_find_extension(), the arguments 'callerid' and
'label' were swapped. The prototype declaration and all calls to the
function are ordered 'callerid' then 'label', but the function itself
was ordered 'label' then 'callerid'.

(closes issue #15303)
Reported by: JimDickenson

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/pbx.c

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

Modified: branches/1.6.1/main/pbx.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/pbx.c?view=diff&rev=199996&r1=199995&r2=199996
==============================================================================
--- branches/1.6.1/main/pbx.c (original)
+++ branches/1.6.1/main/pbx.c Wed Jun 10 15:35:05 2009
@@ -1234,7 +1234,7 @@
 
 #endif
 
-static void new_find_extension(const char *str, struct scoreboard *score, struct match_char *tree, int length, int spec, const char *label, const char *callerid, enum ext_match_t action)
+static void new_find_extension(const char *str, struct scoreboard *score, struct match_char *tree, int length, int spec, const char *callerid, const char *label, enum ext_match_t action)
 {
 	struct match_char *p; /* note minimal stack storage requirements */
 	struct ast_exten pattern = { .label = label };