diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-27 17:17:40 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-27 17:17:40 +0000 |
commit | 6dac7e303bd4fe16eb5303e2feaf3bac62a07637 (patch) | |
tree | 03f27ec876a1d7598d79d989d86471896d0548a8 /main | |
parent | ca3791f1cf172fbfb0cd068aba6871d757f49057 (diff) |
Remove a couple of unused variables (issue #8380, casper)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@48046 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/manager.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/main/manager.c b/main/manager.c index 308da06b0..10dca04e6 100644 --- a/main/manager.c +++ b/main/manager.c @@ -137,10 +137,6 @@ struct mansession { struct sockaddr_in sin; /*! TCP socket */ int fd; - /*! Whether or not we're busy doing an action */ - int busy; - /*! Whether or not we're "dead" */ - int dead; /*! Whether an HTTP manager is in use */ int inuse; /*! Whether an HTTP session should be destroyed */ @@ -1167,8 +1163,6 @@ static int action_waitevent(struct mansession *s, struct message *m) if (!s->send_events) s->send_events = -1; /* Once waitevent is called, always queue events from now on */ - if (s->busy == 1) - s->busy = 2; } ast_mutex_unlock(&s->__lock); s->waiting_thread = pthread_self(); @@ -1880,7 +1874,6 @@ static int process_events(struct mansession *s) int ret = 0; ast_mutex_lock(&s->__lock); if (s->fd > -1) { - s->busy--; if (!s->eventq) s->eventq = master_eventq; while(s->eventq->next) { @@ -1980,9 +1973,6 @@ static int process_message(struct mansession *s, struct message *m) } else astman_send_error(s, m, "Authentication Required"); } else { - ast_mutex_lock(&s->__lock); - s->busy++; - ast_mutex_unlock(&s->__lock); while (tmp) { if (!strcasecmp(action, tmp->action)) { if ((s->writeperm & tmp->authority) == tmp->authority) { @@ -2039,8 +2029,6 @@ static int get_input(struct mansession *s, char *output) ast_mutex_unlock(&s->__lock); if (res < 0) { if (errno == EINTR) { - if (s->dead) - return -1; return 0; } ast_log(LOG_WARNING, "Select returned error: %s\n", strerror(errno)); |