diff options
author | Richard Mudgett <rmudgett@digium.com> | 2015-03-25 18:37:04 +0000 |
---|---|---|
committer | Richard Mudgett <rmudgett@digium.com> | 2015-03-25 18:37:04 +0000 |
commit | dea885a6070a62dfcaa631740b86f7ebdc09c977 (patch) | |
tree | bd54b573ef1e58a226640d7a8332dbffe79d9f29 /main | |
parent | 05de9082a599df079ab1f1eb307b60d04a5c3e3b (diff) |
A couple minor cleanup tweaks.
* In res/res_sorcery_realtime.c: Broke long line.
* In main/bucket.c: Eliminated unnecessary NULL check as
ast_sorcery_unref() is NULL tolerant and set the global object to NULL
after unref in the system shutdown bucket_cleanup().
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@433420 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/bucket.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/main/bucket.c b/main/bucket.c index 90397f1f9..7618761b9 100644 --- a/main/bucket.c +++ b/main/bucket.c @@ -882,9 +882,8 @@ static int bucket_scheme_cmp(void *obj, void *arg, int flags) /*! \brief Cleanup function for graceful shutdowns */ static void bucket_cleanup(void) { - if (bucket_sorcery) { - ast_sorcery_unref(bucket_sorcery); - } + ast_sorcery_unref(bucket_sorcery); + bucket_sorcery = NULL; ast_sorcery_wizard_unregister(&bucket_wizard); ast_sorcery_wizard_unregister(&bucket_file_wizard); |