From 217837cf55b9adad4e2b961ffdff064911859c87 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 26 Nov 2018 12:18:03 +0100 Subject: [PATCH] ctrl: cosmetic cleanup * remove unused function * move internal function call outside of main Change-Id: I3c1bf59775f08f6252d731de653ee9cc212b31da --- scripts/osmo_ctrl.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/scripts/osmo_ctrl.py b/scripts/osmo_ctrl.py index ac20050..2fb1765 100755 --- a/scripts/osmo_ctrl.py +++ b/scripts/osmo_ctrl.py @@ -38,6 +38,7 @@ def connect(host, port): return sck def do_set_get(sck, var, value = None): + _leftovers(sck, socket.MSG_DONTWAIT) (r, c) = Ctrl().cmd(var, value) sck.send(c) ret = sck.recv(4096) @@ -47,10 +48,6 @@ def set_var(sck, var, val): (a, _, _) = do_set_get(sck, var, val) return a -def get_var(sck, var): - (_, _, v) = do_set_get(sck, var) - return v - def _leftovers(sck, fl): """ Read outstanding data if any according to flags @@ -102,13 +99,11 @@ if __name__ == '__main__': if options.cmd_set: if len(args) < 2: parser.error("Set requires var and value arguments") - _leftovers(sock, socket.MSG_DONTWAIT) print("Got message:", set_var(sock, args[0], ' '.join(args[1:]))) if options.cmd_get: if len(args) != 1: parser.error("Get requires the var argument") - _leftovers(sock, socket.MSG_DONTWAIT) (a, _, _) = do_set_get(sock, args[0]) print("Got message:", a)