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 /res/res_pjsip_registrar_expire.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 'res/res_pjsip_registrar_expire.c')
| -rw-r--r-- | res/res_pjsip_registrar_expire.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_pjsip_registrar_expire.c b/res/res_pjsip_registrar_expire.c index 64f61ce41..53f34c614 100644 --- a/res/res_pjsip_registrar_expire.c +++ b/res/res_pjsip_registrar_expire.c @@ -142,7 +142,7 @@ static void contact_expiration_observer_deleted(const void *object) } /*! \brief Observer callbacks for autoexpiring contacts */ -static struct ast_sorcery_observer contact_expiration_observer = { +static const struct ast_sorcery_observer contact_expiration_observer = { .created = contact_expiration_observer_created, .updated = contact_expiration_observer_updated, .deleted = contact_expiration_observer_deleted, |