diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-12-03 17:35:54 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-12-03 17:35:54 +0000 |
| commit | 3357c494cb21f24b7185ee3b255bc0cd72d48a55 (patch) | |
| tree | 8a188ee6573bbf63fce7cd1b9d28a7d2d31c8047 /main/bucket.c | |
| parent | 8e8b329e14ad2e4d747c4c4eb33c118305401aee (diff) | |
sorcery, bucket: Change observer remove calls to take const callbacks struct.
* Make ast_sorcery_observer_remove() accept a const callbacks struct.
* Make ast_sorcery_observer_remove() tolerant of the sorcery parameter
being NULL. Now it can be called within a module unload routine if the
sorcery initialization fails.
* Fix ast_sorcery_observer_add() to fail if the container link fails.
........
Merged revisions 403324 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@403327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bucket.c')
| -rw-r--r-- | main/bucket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/bucket.c b/main/bucket.c index 10d230b7b..b3a0d3ca9 100644 --- a/main/bucket.c +++ b/main/bucket.c @@ -473,7 +473,7 @@ int ast_bucket_observer_add(const struct ast_sorcery_observer *callbacks) return ast_sorcery_observer_add(bucket_sorcery, "bucket", callbacks); } -void ast_bucket_observer_remove(struct ast_sorcery_observer *callbacks) +void ast_bucket_observer_remove(const struct ast_sorcery_observer *callbacks) { ast_sorcery_observer_remove(bucket_sorcery, "bucket", callbacks); } @@ -763,7 +763,7 @@ int ast_bucket_file_observer_add(const struct ast_sorcery_observer *callbacks) return ast_sorcery_observer_add(bucket_sorcery, "file", callbacks); } -void ast_bucket_file_observer_remove(struct ast_sorcery_observer *callbacks) +void ast_bucket_file_observer_remove(const struct ast_sorcery_observer *callbacks) { ast_sorcery_observer_remove(bucket_sorcery, "file", callbacks); } |