diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-08 05:28:47 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-08 05:28:47 +0000 |
| commit | a45a413db3bdce126d5cb28ed49b776fdebb4b1d (patch) | |
| tree | 444ea944312fd31b5524ee43f8cfc97e2884c6de /main/indications.c | |
| parent | beabbf77e66fbdd59fdcb5e12dade8039fd0b683 (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: http://svn.digium.com/svn/asterisk/trunk@89106 f38db490-d61c-443f-a65b-d21fe96a405b
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; |