<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/14963">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">logger.h: Fix ast_trace to respect scope_level<br><br>ast_trace() was always emitting messages when it's level was set to -1<br>because it was ignoring scope_level.<br><br>Change-Id: I849c8f4f4613899c37f82be0202024e7d117e506<br>---<br>M include/asterisk/logger.h<br>1 file changed, 2 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/logger.h b/include/asterisk/logger.h</span><br><span>index 72c938d..6ab55f7 100644</span><br><span>--- a/include/asterisk/logger.h</span><br><span>+++ b/include/asterisk/logger.h</span><br><span>@@ -663,7 +663,7 @@</span><br><span> */</span><br><span> #define ast_trace_raw(level, indent_type, ...) \</span><br><span> ast_debug(level < 0 ? __scope_level : level, " " __VA_ARGS__); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (TRACE_ATLEAST(level)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TRACE_ATLEAST(level < 0 ? __scope_level : level)) { \</span><br><span> __ast_trace(__FILE__, __LINE__, __PRETTY_FUNCTION__, indent_type, 0, " " __VA_ARGS__); \</span><br><span> }</span><br><span> </span><br><span>@@ -678,7 +678,7 @@</span><br><span> */</span><br><span> #define ast_trace(level, ...) \</span><br><span> ast_debug(level < 0 ? __scope_level : level, " " __VA_ARGS__); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (TRACE_ATLEAST(level)) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (TRACE_ATLEAST(level < 0 ? __scope_level : level)) { \</span><br><span> __ast_trace(__FILE__, __LINE__, __PRETTY_FUNCTION__, AST_TRACE_INDENT_SAME, 0, " " __VA_ARGS__); \</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/14963">change 14963</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/c/asterisk/+/14963"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 17 </div>
<div style="display:none"> Gerrit-Change-Id: I849c8f4f4613899c37f82be0202024e7d117e506 </div>
<div style="display:none"> Gerrit-Change-Number: 14963 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>