From: David Brooks <dbrooks@digium.com>
Date: Wed, 10 Jun 2009 20:35:05 +0000 (+0000)
Subject: Fixes the argument order in definition of new_find_extension().
X-Git-Tag: 1.6.1.3-rc1~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f775fa399f55b1b9176610e03bde03b55b56736;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@199996 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index b4e5f1189a..8fdc769c95 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1234,7 +1234,7 @@ static char *action2str(enum ext_match_t action)
 
 #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 };