<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12092">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Stefan Sperling: Looks good to me, but someone else must approve
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Allow log_init() with NULL log_info<br><br>Since we have library-internal categories we don't have to force<br>application to supply its own categories. This is especially useful for<br>testing code inside libosmocore which only use internal categories<br>anyway.<br><br>Change-Id: I42159780b57684bff225789f036f28a4b25fc7b8<br>---<br>M src/logging.c<br>1 file changed, 15 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/logging.c b/src/logging.c</span><br><span>index e7cc472..2bb53ae 100644</span><br><span>--- a/src/logging.c</span><br><span>+++ b/src/logging.c</span><br><span>@@ -948,9 +948,11 @@</span><br><span> }</span><br><span> </span><br><span> /*! Initialize the Osmocom logging core</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] inf Information regarding logging categories</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] inf Information regarding logging categories, could be NULL</span><br><span> * \param[in] ctx \ref talloc context for logging allocations</span><br><span> * \returns 0 in case of success, negative in case of error</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * If inf is NULL then only library-internal categories are initialized.</span><br><span> */</span><br><span> int log_init(const struct log_info *inf, void *ctx)</span><br><span> {</span><br><span>@@ -964,10 +966,13 @@</span><br><span> if (!osmo_log_info)</span><br><span> return -ENOMEM;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- osmo_log_info->filter_fn = inf->filter_fn;</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_log_info->num_cat_user = inf->num_cat;</span><br><span style="color: hsl(0, 100%, 40%);">- /* total number = number of user cat + library cat */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_log_info->num_cat = inf->num_cat + ARRAY_SIZE(internal_cat);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_log_info->num_cat = ARRAY_SIZE(internal_cat);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inf) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_log_info->filter_fn = inf->filter_fn;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_log_info->num_cat_user = inf->num_cat;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_log_info->num_cat += inf->num_cat;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> osmo_log_info->cat = talloc_zero_array(osmo_log_info,</span><br><span> struct log_info_cat,</span><br><span>@@ -978,11 +983,11 @@</span><br><span> return -ENOMEM;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* copy over the user part */</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < inf->num_cat; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy((struct log_info_cat *) &osmo_log_info->cat[i],</span><br><span style="color: hsl(0, 100%, 40%);">- &inf->cat[i],</span><br><span style="color: hsl(0, 100%, 40%);">- sizeof(struct log_info_cat));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inf) { /* copy over the user part */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < inf->num_cat; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy((struct log_info_cat *) &osmo_log_info->cat[i],</span><br><span style="color: hsl(120, 100%, 40%);">+ &inf->cat[i], sizeof(struct log_info_cat));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* copy over the library part */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12092">change 12092</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/12092"/><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: I42159780b57684bff225789f036f28a4b25fc7b8 </div>
<div style="display:none"> Gerrit-Change-Number: 12092 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>