<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11104">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;">utils/osmo-config-merge: explicitly return from main()<br><br>This change fixes the following compiler warning:<br><br>  osmo-config-merge.c: In function ‘main’:<br>  osmo-config-merge.c:268:1: warning: control reaches end<br>                             of non-void function [-Wreturn-type]<br><br>Despite it isn't critical, let's get rid of this warning.<br><br>Change-Id: I7a80a85c8b3180dc086cd9fd20356aab16ea8100<br>---<br>M utils/osmo-config-merge.c<br>1 file changed, 2 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/utils/osmo-config-merge.c b/utils/osmo-config-merge.c</span><br><span>index 3762c67..c76e42d 100644</span><br><span>--- a/utils/osmo-config-merge.c</span><br><span>+++ b/utils/osmo-config-merge.c</span><br><span>@@ -265,4 +265,6 @@</span><br><span>  /* make AddressSanitizer / LeakSanitizer happy by recursively freeing the trees */</span><br><span>   talloc_free(patch_tree);</span><br><span>     talloc_free(base_tree);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+     return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11104">change 11104</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/11104"/><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: I7a80a85c8b3180dc086cd9fd20356aab16ea8100 </div>
<div style="display:none"> Gerrit-Change-Number: 11104 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>