<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10539">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use __FILE__, not __BASE_FILE__<br><br>The intention was to use the file's basename, but __BASE_FILE__ means "the root<br>file that is being parsed and contains #include statements".<br><br>If we had a function using __BASE_FILE__ and that was defined in an #included<br>file, __BASE_FILE__ would indicate the first file where the #include is, and<br>not the file where the function is defined. __BASE_FILE__ works for us because<br>we don't ever include function definitions that log something, so __BASE_FILE__<br>always coincides with __FILE__ for our logging; but still __BASE_FILE__ is<br>semantically the wrong constant.<br><br>Related: OS#2740<br>Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce<br>---<br>M include/osmocom/msc/osmo_msc.h<br>M include/osmocom/msc/vlr.h<br>2 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/osmo_msc.h b/include/osmocom/msc/osmo_msc.h</span><br><span>index 995b195..7b3702a 100644</span><br><span>--- a/include/osmocom/msc/osmo_msc.h</span><br><span>+++ b/include/osmocom/msc/osmo_msc.h</span><br><span>@@ -101,9 +101,9 @@</span><br><span> { return get_value_string(msc_subscr_conn_use_names, val); }</span><br><span> </span><br><span> #define msc_subscr_conn_get(conn, balance_token) \</span><br><span style="color: hsl(0, 100%, 40%);">- _msc_subscr_conn_get(conn, balance_token, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _msc_subscr_conn_get(conn, balance_token, __FILE__, __LINE__)</span><br><span> #define msc_subscr_conn_put(conn, balance_token) \</span><br><span style="color: hsl(0, 100%, 40%);">- _msc_subscr_conn_put(conn, balance_token, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _msc_subscr_conn_put(conn, balance_token, __FILE__, __LINE__)</span><br><span> struct gsm_subscriber_connection *</span><br><span> _msc_subscr_conn_get(struct gsm_subscriber_connection *conn,</span><br><span> enum msc_subscr_conn_use balance_token,</span><br><span>diff --git a/include/osmocom/msc/vlr.h b/include/osmocom/msc/vlr.h</span><br><span>index 91c28db..386a548 100644</span><br><span>--- a/include/osmocom/msc/vlr.h</span><br><span>+++ b/include/osmocom/msc/vlr.h</span><br><span>@@ -326,19 +326,19 @@</span><br><span> const char *vlr_subscr_msisdn_or_name(struct vlr_subscr *vsub);</span><br><span> </span><br><span> #define vlr_subscr_find_by_imsi(vlr, imsi) \</span><br><span style="color: hsl(0, 100%, 40%);">- _vlr_subscr_find_by_imsi(vlr, imsi, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _vlr_subscr_find_by_imsi(vlr, imsi, __FILE__, __LINE__)</span><br><span> #define vlr_subscr_find_or_create_by_imsi(vlr, imsi, created) \</span><br><span> _vlr_subscr_find_or_create_by_imsi(vlr, imsi, created, \</span><br><span style="color: hsl(0, 100%, 40%);">- __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ __FILE__, __LINE__)</span><br><span> </span><br><span> #define vlr_subscr_find_by_tmsi(vlr, tmsi) \</span><br><span style="color: hsl(0, 100%, 40%);">- _vlr_subscr_find_by_tmsi(vlr, tmsi, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _vlr_subscr_find_by_tmsi(vlr, tmsi, __FILE__, __LINE__)</span><br><span> #define vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created) \</span><br><span> _vlr_subscr_find_or_create_by_tmsi(vlr, tmsi, created, \</span><br><span style="color: hsl(0, 100%, 40%);">- __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ __FILE__, __LINE__)</span><br><span> </span><br><span> #define vlr_subscr_find_by_msisdn(vlr, msisdn) \</span><br><span style="color: hsl(0, 100%, 40%);">- _vlr_subscr_find_by_msisdn(vlr, msisdn, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+ _vlr_subscr_find_by_msisdn(vlr, msisdn, __FILE__, __LINE__)</span><br><span> </span><br><span> struct vlr_subscr *_vlr_subscr_find_by_imsi(struct vlr_instance *vlr,</span><br><span> const char *imsi,</span><br><span>@@ -362,8 +362,8 @@</span><br><span> const char *msisdn,</span><br><span> const char *file, int line);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(0, 100%, 40%);">-#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __BASE_FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+#define vlr_subscr_get(sub) _vlr_subscr_get(sub, __FILE__, __LINE__)</span><br><span style="color: hsl(120, 100%, 40%);">+#define vlr_subscr_put(sub) _vlr_subscr_put(sub, __FILE__, __LINE__)</span><br><span> struct vlr_subscr *_vlr_subscr_get(struct vlr_subscr *sub, const char *file, int line);</span><br><span> struct vlr_subscr *_vlr_subscr_put(struct vlr_subscr *sub, const char *file, int line);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10539">change 10539</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/10539"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I1c8122c909938daaf782468c1c5b0262d555c3ce </div>
<div style="display:none"> Gerrit-Change-Number: 10539 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>