diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-11-08 05:28:47 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-11-08 05:28:47 +0000 |
| commit | edc78d6023c379c19afff8c94632d7118295ff60 (patch) | |
| tree | 444ea944312fd31b5524ee43f8cfc97e2884c6de /main/indications.c | |
| parent | 950528b638cc290e4ea661ec3426f73230703e9e (diff) | |
improve linked-list macros in two ways:
- the *_CURRENT macros no longer need the list head pointer argument
- add AST_LIST_MOVE_CURRENT to encapsulate the remove/add operation when moving entries between lists
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89106 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/indications.c')
| -rw-r--r-- | main/indications.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/indications.c b/main/indications.c index 61f3328b5..ebebc682b 100644 --- a/main/indications.c +++ b/main/indications.c @@ -480,12 +480,12 @@ int ast_register_indication_country(struct ind_tone_zone *zone) if (tz == current_tonezone) current_tonezone = zone; /* Remove from the linked list */ - AST_RWLIST_REMOVE_CURRENT(&tone_zones, list); + AST_RWLIST_REMOVE_CURRENT(list); /* Finally free the zone itself */ free_zone(tz); break; } - AST_RWLIST_TRAVERSE_SAFE_END + AST_RWLIST_TRAVERSE_SAFE_END; /* Add zone to the list */ AST_RWLIST_INSERT_TAIL(&tone_zones, zone, list); @@ -515,12 +515,12 @@ int ast_unregister_indication_country(const char *country) current_tonezone = NULL; } /* Remove from the list */ - AST_RWLIST_REMOVE_CURRENT(&tone_zones, list); + AST_RWLIST_REMOVE_CURRENT(list); ast_verb(3, "Unregistered indication country '%s'\n", tz->country); free_zone(tz); res = 0; } - AST_RWLIST_TRAVERSE_SAFE_END + AST_RWLIST_TRAVERSE_SAFE_END; AST_RWLIST_UNLOCK(&tone_zones); return res; |