backport list handling fix from trunk (solves memory leak problem in cdr variables and device state watchers)

remove unusued variable to silence compiler warning


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@10863 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-02-23 14:57:53 +00:00
parent 842e9246a6
commit fcf8040825
2 changed files with 5 additions and 3 deletions

View File

@@ -307,7 +307,6 @@ static int do_reload(int loading)
const char *enabled_value;
int interval;
int was_enabled;
pthread_attr_t attr;
int res = -1;
/* ensure that no refresh cycles run while the reload is in progress */

View File

@@ -274,9 +274,11 @@ struct { \
#define AST_LIST_TRAVERSE_SAFE_BEGIN(head, var, field) { \
typeof((head)->first) __list_next; \
typeof((head)->first) __list_prev = NULL; \
for ((var) = (head)->first, __list_next = (var) ? (var)->field.next : NULL; \
typeof((head)->first) __new_prev = NULL; \
for ((var) = (head)->first, __new_prev = (var), \
__list_next = (var) ? (var)->field.next : NULL; \
(var); \
__list_prev = (var), (var) = __list_next, \
__list_prev = __new_prev, (var) = __list_next, \
__list_next = (var) ? (var)->field.next : NULL \
)
@@ -292,6 +294,7 @@ struct { \
previous entry, if any).
*/
#define AST_LIST_REMOVE_CURRENT(head, field) \
__new_prev = __list_prev; \
if (__list_prev) \
__list_prev->field.next = __list_next; \
else \