From 3516eaa7e0f99d15e5815b4d2f779343aa9bcc01 Mon Sep 17 00:00:00 2001 From: David Brooks Date: Wed, 10 Jun 2009 20:29:52 +0000 Subject: [PATCH] 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.0@199994 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pbx.c b/main/pbx.c index de5dff6cd3..8a24af7c9c 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1224,7 +1224,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 };