Change in osmo-bts[master]: oc2g: Cleanup of get_hwversion_desc

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/12964 )

Change subject: oc2g: Cleanup of get_hwversion_desc
......................................................................

oc2g: Cleanup of get_hwversion_desc

Remove unused variables, wrong return type values, etc.

Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
---
M src/osmo-bts-oc2g/misc/oc2gbts_bid.c
1 file changed, 3 insertions(+), 8 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Vadim Yanitskiy: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
index 6eaa9c6..c2cd483 100644
--- a/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
+++ b/src/osmo-bts-oc2g/misc/oc2gbts_bid.c
@@ -24,6 +24,7 @@
 #include <string.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <inttypes.h>
 
 #include "oc2gbts_bid.h"
 
@@ -106,7 +107,6 @@
 
 const char* get_hwversion_desc()
 {
-        int rev;
         int model;
         size_t len;
         static char model_name[64] = {0, };
@@ -114,14 +114,9 @@
 
         char rev_maj = 0, rev_min = 0;
 
-        int rc = 0;
         oc2gbts_rev_get(&rev_maj, &rev_min);
-        if (rc < 0)
-                return rc;
-        if (rev >= 0) {
-                len += snprintf(model_name + len, sizeof(model_name) - len,
-                                " Rev %d.%d", (uint8_t)rev_maj, (uint8_t)rev_min);
-        }
+        len += snprintf(model_name + len, sizeof(model_name) - len,
+                        " Rev %" PRIu8 ".%" PRIu8, (uint8_t)rev_maj, (uint8_t)rev_min);
 
         model = oc2gbts_model_get();
         if (model >= 0) {

-- 
To view, visit https://gerrit.osmocom.org/12964
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I5565b904c72a9ac1775818416f05c64722d366b2
Gerrit-Change-Number: 12964
Gerrit-PatchSet: 2
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Vadim Yanitskiy <axilirator at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190220/72681672/attachment.htm>