diff options
| -rw-r--r-- | main/bucket.c | 5 | ||||
| -rw-r--r-- | res/res_sorcery_realtime.c | 4 |
2 files changed, 5 insertions, 4 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); diff --git a/res/res_sorcery_realtime.c b/res/res_sorcery_realtime.c index 52b097f57..fcdc2a971 100644 --- a/res/res_sorcery_realtime.c +++ b/res/res_sorcery_realtime.c @@ -158,7 +158,9 @@ static void *sorcery_realtime_retrieve_fields(const struct ast_sorcery *sorcery, objectset = sorcery_realtime_filter_objectset(objectset, &id, sorcery, type); - if (!id || !(object = ast_sorcery_alloc(sorcery, type, id->value)) || ast_sorcery_objectset_apply(sorcery, object, objectset)) { + if (!id + || !(object = ast_sorcery_alloc(sorcery, type, id->value)) + || ast_sorcery_objectset_apply(sorcery, object, objectset)) { return NULL; } |