<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12964">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;">oc2g: Cleanup of get_hwversion_desc<br><br>Remove unused variables, wrong return type values, etc.<br><br>Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2<br>---<br>M src/osmo-bts-oc2g/misc/oc2gbts_bid.c<br>1 file changed, 3 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c</span><br><span>index 6eaa9c6..c2cd483 100644</span><br><span>--- a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c</span><br><span>+++ b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c</span><br><span>@@ -24,6 +24,7 @@</span><br><span> #include <string.h></span><br><span> #include <errno.h></span><br><span> #include <fcntl.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <inttypes.h></span><br><span> </span><br><span> #include "oc2gbts_bid.h"</span><br><span> </span><br><span>@@ -106,7 +107,6 @@</span><br><span> </span><br><span> const char* get_hwversion_desc()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        int rev;</span><br><span>         int model;</span><br><span>         size_t len;</span><br><span>         static char model_name[64] = {0, };</span><br><span>@@ -114,14 +114,9 @@</span><br><span> </span><br><span>         char rev_maj = 0, rev_min = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        int rc = 0;</span><br><span>         oc2gbts_rev_get(&rev_maj, &rev_min);</span><br><span style="color: hsl(0, 100%, 40%);">-        if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (rev >= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                len += snprintf(model_name + len, sizeof(model_name) - len,</span><br><span style="color: hsl(0, 100%, 40%);">-                                " Rev %d.%d", (uint8_t)rev_maj, (uint8_t)rev_min);</span><br><span style="color: hsl(0, 100%, 40%);">-        }</span><br><span style="color: hsl(120, 100%, 40%);">+        len += snprintf(model_name + len, sizeof(model_name) - len,</span><br><span style="color: hsl(120, 100%, 40%);">+                        " Rev %" PRIu8 ".%" PRIu8, (uint8_t)rev_maj, (uint8_t)rev_min);</span><br><span> </span><br><span>         model = oc2gbts_model_get();</span><br><span>         if (model >= 0) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12964">change 12964</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/12964"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2 </div>
<div style="display:none"> Gerrit-Change-Number: 12964 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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: Vadim Yanitskiy <axilirator@gmail.com> </div>