From 9b5c5f096a16ec455df780054643a56fc3a18d9d Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Fri, 11 Jul 2008 19:45:25 +0000 Subject: [PATCH] Merged revisions 130230 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r130230 | tilghman | 2008-07-11 14:40:55 -0500 (Fri, 11 Jul 2008) | 2 lines Fix trunk breakage ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130231 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_agent.c | 2 +- channels/chan_dahdi.c | 2 +- utils/astman.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 36595a7b13..9d6e14a168 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -2483,7 +2483,7 @@ static int unload_module(void) /* First, take us out of the channel loop */ ast_channel_unregister(&agent_tech); /* Delete devicestate subscription */ - agent_devicestate_sub = ast_event_unsubscribe(agent_devicestate_sub); + ast_event_unsubscribe(agent_devicestate_sub); /* Unregister dialplan functions */ ast_custom_function_unregister(&agent_function); /* Unregister CLI commands */ diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d8d57537f4..1f4d270428 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -13512,7 +13512,7 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data, unsigned int param_count; unsigned int x; - if (!(param_count = ast_app_separate_args(parse, ',', params, ARRAY_LEN(params))) + if (!(param_count = ast_app_separate_args(parse, ',', params, ARRAY_LEN(params)))) return; memset(&confp->chan.echocancel, 0, sizeof(confp->chan.echocancel)); diff --git a/utils/astman.c b/utils/astman.c index 6c8d74291b..3cfc27d81c 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -41,6 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/md5.h" #include "asterisk/linkedlists.h" +#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0])) #undef gethostbyname