kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

A couple minor cleanup tweaks.

Browse Source 
* 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().
........

Merged revisions 433420 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2015-03-25 18:37:51 +00:00
parent 47156aab92
commit e953d15223
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
main/bucket.c
View File

@@ -882,9 +882,8 @@ static int bucket_scheme_cmp(void *obj, void *arg, int flags)
/*! \brief Cleanup function for graceful shutdowns */ /*! \brief Cleanup function for graceful shutdowns */
static void bucket_cleanup(void) 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_wizard);
ast_sorcery_wizard_unregister(&bucket_file_wizard); ast_sorcery_wizard_unregister(&bucket_file_wizard);

4
res/res_sorcery_realtime.c
View File

@@ -158,7 +158,9 @@ static void *sorcery_realtime_retrieve_fields(const struct ast_sorcery *sorcery,
objectset = sorcery_realtime_filter_objectset(objectset, &id, sorcery, type); 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; return NULL;
} }