<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12383">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">define LOGPFSM fmt only once, in LOGPFSMLSRC<br><br>Instead of duplicating the fmt and args in LOGPFSML and LOGPFSMLSRC, rather<br>make LOGPFSML invoke LOGPFSMLSRC with __FILE__ and __LINE__.<br><br>This is a cosmetic preparation for more tweaks coming up.<br><br>Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97<br>---<br>M include/osmocom/core/fsm.h<br>1 file changed, 4 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/core/fsm.h b/include/osmocom/core/fsm.h</span><br><span>index 54bbad5..ee71451 100644</span><br><span>--- a/include/osmocom/core/fsm.h</span><br><span>+++ b/include/osmocom/core/fsm.h</span><br><span>@@ -120,13 +120,7 @@</span><br><span> void osmo_fsm_log_addr(bool log_addr);</span><br><span> </span><br><span> #define LOGPFSML(fi, level, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-            LOGP((fi)->fsm->log_subsys, OSMO_MAX(level, (fi)->log_level), \</span><br><span style="color: hsl(0, 100%, 40%);">-                        "%s{%s}: " fmt, \</span><br><span style="color: hsl(0, 100%, 40%);">-                     osmo_fsm_inst_name(fi),                             \</span><br><span style="color: hsl(0, 100%, 40%);">-                   osmo_fsm_state_name((fi)->fsm, (fi)->state), ## args)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define LOGPFSM(fi, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">-          LOGPFSML(fi, (fi)->log_level, fmt, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+                LOGPFSMLSRC(fi, level, __FILE__, __LINE__, fmt, ## args)</span><br><span> </span><br><span> #define LOGPFSMLSRC(fi, level, caller_file, caller_line, fmt, args...) \</span><br><span>             LOGPSRC((fi)->fsm->log_subsys, level, \</span><br><span>@@ -136,6 +130,9 @@</span><br><span>                  osmo_fsm_state_name((fi)->fsm, (fi)->state), \</span><br><span>                         ## args)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGPFSM(fi, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+             LOGPFSML(fi, (fi)->log_level, fmt, ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #define LOGPFSMSRC(fi, caller_file, caller_line, fmt, args...) \</span><br><span>                 LOGPFSMLSRC(fi, (fi)->log_level, \</span><br><span>                            caller_file, caller_line, \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12383">change 12383</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.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.osmocom.org/12383"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2f23c57ebfdb5355919c06ac5ded7732e3b17a97 </div>
<div style="display:none"> Gerrit-Change-Number: 12383 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>