diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2015-03-25 18:37:51 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2015-03-25 18:37:51 +0000 |
| commit | e953d1522345bdc6116348ae52185a4e60599790 (patch) | |
| tree | 90592053a6ff49b0ed656b8d0cdbea2627ca5485 /res/res_sorcery_realtime.c | |
| parent | 47156aab92ce5af58cf72f666f09d9f23bac754d (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().
........
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
Diffstat (limited to 'res/res_sorcery_realtime.c')
| -rw-r--r-- | res/res_sorcery_realtime.c | 4 |
1 files changed, 3 insertions, 1 deletions
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; } |