kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-25 15:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28674 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-05-19 16:07:43 +00:00
parent 54282f4e4b
commit a2ebf8a0fb
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/app_queue.c
View File

@@ -431,6 +431,8 @@ static enum queue_member_status get_member_status(const struct ast_call_queue *q
enum queue_member_status result = QUEUE_NO_MEMBERS; enum queue_member_status result = QUEUE_NO_MEMBERS;
for (member = q->members; member; member = member->next) { for (member = q->members; member; member = member->next) {
if (member->paused) continue;
switch (member->status) { switch (member->status) {
case AST_DEVICE_INVALID: case AST_DEVICE_INVALID:
/* nothing to do */ /* nothing to do */

4
apps/app_voicemail.c
View File

@@ -5310,7 +5310,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
case '5': /* Leave VoiceMail */ case '5': /* Leave VoiceMail */
if (ast_test_flag(vmu, VM_SVMAIL)) { if (ast_test_flag(vmu, VM_SVMAIL)) {
cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain); cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 1, record_gain);
if (cmd == ERROR_LOCK_PATH) { if (cmd == ERROR_LOCK_PATH) {
res = cmd; res = cmd;
goto out; goto out;
@@ -5391,7 +5391,7 @@ static int vm_execmain(struct ast_channel *chan, void *data)
case '8': case '8':
if (vms.lastmsg > -1) { if (vms.lastmsg > -1) {
cmd = forward_message(chan, context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain); cmd = forward_message(chan, vmu->context, vms.curdir, vms.curmsg, vmu, vmfmts, 0, record_gain);
if (cmd == ERROR_LOCK_PATH) { if (cmd == ERROR_LOCK_PATH) {
res = cmd; res = cmd;
goto out; goto out;

4
enum.c
View File

@@ -80,7 +80,7 @@ struct naptr {
} __attribute__ ((__packed__)); } __attribute__ ((__packed__));
/*--- parse_ie: Parse NAPTR record information elements */ /*--- parse_ie: Parse NAPTR record information elements */
static unsigned int parse_ie(char *data, unsigned int maxdatalen, char *src, unsigned int srclen) static unsigned int parse_ie(unsigned char *data, unsigned int maxdatalen, unsigned char *src, unsigned int srclen)
{ {
unsigned int len, olen; unsigned int len, olen;
@@ -101,7 +101,7 @@ static unsigned int parse_ie(char *data, unsigned int maxdatalen, char *src, uns
} }
/*--- parse_naptr: Parse DNS NAPTR record used in ENUM ---*/ /*--- parse_naptr: Parse DNS NAPTR record used in ENUM ---*/
static int parse_naptr(char *dst, int dstsize, char *tech, int techsize, char *answer, int len, char *naptrinput) static int parse_naptr(unsigned char *dst, int dstsize, char *tech, int techsize, unsigned char *answer, int len, unsigned char *naptrinput)
{ {
char tech_return[80]; char tech_return[80];
char *oanswer = answer; char *oanswer = answer;