<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11930">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: cosmetic cleanup<br><br>* remove unused function<br>* move internal function call outside of main<br><br>Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da<br>---<br>M scripts/osmo_ctrl.py<br>1 file changed, 1 insertion(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py</span><br><span>index ac20050..2fb1765 100755</span><br><span>--- a/scripts/osmo_ctrl.py</span><br><span>+++ b/scripts/osmo_ctrl.py</span><br><span>@@ -38,6 +38,7 @@</span><br><span>         return sck</span><br><span> </span><br><span> def do_set_get(sck, var, value = None):</span><br><span style="color: hsl(120, 100%, 40%);">+        _leftovers(sck, socket.MSG_DONTWAIT)</span><br><span>         (r, c) = Ctrl().cmd(var, value)</span><br><span>         sck.send(c)</span><br><span>         ret = sck.recv(4096)</span><br><span>@@ -47,10 +48,6 @@</span><br><span>         (a, _, _) = do_set_get(sck, var, val)</span><br><span>         return a</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-def get_var(sck, var):</span><br><span style="color: hsl(0, 100%, 40%);">-        (_, _, v) = do_set_get(sck, var)</span><br><span style="color: hsl(0, 100%, 40%);">-        return v</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> def _leftovers(sck, fl):</span><br><span>         """</span><br><span>         Read outstanding data if any according to flags</span><br><span>@@ -102,13 +99,11 @@</span><br><span>         if options.cmd_set:</span><br><span>                 if len(args) < 2:</span><br><span>                         parser.error("Set requires var and value arguments")</span><br><span style="color: hsl(0, 100%, 40%);">-                _leftovers(sock, socket.MSG_DONTWAIT)</span><br><span>                 print("Got message:", set_var(sock, args[0], ' '.join(args[1:])))</span><br><span> </span><br><span>         if options.cmd_get:</span><br><span>                 if len(args) != 1:</span><br><span>                         parser.error("Get requires the var argument")</span><br><span style="color: hsl(0, 100%, 40%);">-                _leftovers(sock, socket.MSG_DONTWAIT)</span><br><span>                 (a, _, _) = do_set_get(sock, args[0])</span><br><span>                 print("Got message:", a)</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11930">change 11930</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/11930"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: python/osmo-python-tests </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da </div>
<div style="display:none"> Gerrit-Change-Number: 11930 </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: 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: daniel <dwillmann@sysmocom.de> </div>