From: Richard Mudgett <rmudgett@digium.com>
Date: Wed, 25 Mar 2015 18:37:51 +0000 (+0000)
Subject: A couple minor cleanup tweaks.
X-Git-Tag: 14.0.0-beta1~1159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e953d1522345bdc6116348ae52185a4e60599790;p=thirdparty%2Fasterisk.git

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().
........

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
---

diff --git a/main/bucket.c b/main/bucket.c
index 90397f1f9b..7618761b9f 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 52b097f57b..fcdc2a9717 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;
 	}