aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-09 16:47:35 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-09 16:47:35 +0000
commita785e2e7fd6df78a0be5d1383626b5690660d68f (patch)
tree1a55ae37ecb2cff4bb9985ffe3da72bf91620f0e
parentd805f44e24744bc474cb2a09a5a9e7ef714b16f9 (diff)
Merging Revision 142090 from 1.6.0.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@142143 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_queue.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 283481b13..86a51bd11 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -753,19 +753,8 @@ static int update_status(const char *interface, const int status)
static int handle_statechange(void *datap)
{
struct member_interface *curint;
- char *loc;
- char *technology;
struct statechange *sc = datap;
- technology = ast_strdupa(sc->dev);
- loc = strchr(technology, '/');
- if (loc) {
- *loc++ = '\0';
- } else {
- ast_free(sc);
- return 0;
- }
-
AST_LIST_LOCK(&interfaces);
AST_LIST_TRAVERSE(&interfaces, curint, list) {
char *interface;
@@ -781,12 +770,12 @@ static int handle_statechange(void *datap)
AST_LIST_UNLOCK(&interfaces);
if (!curint) {
- ast_debug(3, "Device '%s/%s' changed to state '%d' (%s) but we don't care because they're not a member of any queue.\n", technology, loc, sc->state, devstate2str(sc->state));
+ ast_debug(3, "Device '%s' changed to state '%d' (%s) but we don't care because they're not a member of any queue.\n", sc->dev, sc->state, devstate2str(sc->state));
ast_free(sc);
return 0;
}
- ast_debug(1, "Device '%s/%s' changed to state '%d' (%s)\n", technology, loc, sc->state, devstate2str(sc->state));
+ ast_debug(1, "Device '%s' changed to state '%d' (%s)\n", sc->dev, sc->state, devstate2str(sc->state));
update_status(sc->dev, sc->state);
ast_free(sc);