[Git][NTPsec/ntpsec][master] 3 commits: Remove unused variable.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
5c176607 by Matt Selsky at 2016-12-14T23:18:46-05:00
Remove unused variable.

pyflakes reports:
wafhelpers/check_compiler.py:42: local variable 'ret' is assigned to but never used

- - - - -
9d0ee3ee by Matt Selsky at 2016-12-14T23:18:46-05:00
define_ret defaults to False

- - - - -
1ce7f4dd by Matt Selsky at 2016-12-14T23:18:46-05:00
Fix mrulist sort order for count/avgint

GitLab issue #208

- - - - -


3 changed files:

- pylib/packet.py
- wafhelpers/check_compiler.py
- wafhelpers/check_openssl.py


Changes:

=====================================
pylib/packet.py
=====================================
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -1207,12 +1207,12 @@ class ControlSession:
                 sortdict = {
                 "lstint" : lambda e: e.last,		# lstint ascending
                 "-lstint" : lambda e: -e.last,		# lstint descending
-                "avgint" : lambda e: e.avgint(),	# avgint ascending
-                "-avgint" : lambda e: -e.avgint(),	# avgint descending
+                "avgint" : lambda e: -e.avgint(),	# avgint ascending
+                "-avgint" : lambda e: e.avgint(),	# avgint descending
                 "addr" : None,			# IPv4 asc. then IPv6 asc.
                 "-addr" : None,			# IPv6 desc. then IPv4 desc.
-                "count" : lambda e: e.ct,	# hit count ascending
-                "-count": lambda e: -e.ct,	# hit count descending
+                "count" : lambda e: -e.ct,	# hit count ascending
+                "-count": lambda e: e.ct,	# hit count descending
                 }
                 if sortkey == "listint":
                     sortkey = None


=====================================
wafhelpers/check_compiler.py
=====================================
--- a/wafhelpers/check_compiler.py
+++ b/wafhelpers/check_compiler.py
@@ -39,7 +39,7 @@ def check_compiler(ctx):
 		255: ("COMPILER_GCC",	"Unknown (Defaulting to GCC)"),
 	}
 
-	ret = ctx.check_cc(
+	ctx.check_cc(
 		fragment	= COMPILER_FRAG,
 		msg			= "Checking compiler",
 		define_name = "COMPILER_INT",


=====================================
wafhelpers/check_openssl.py
=====================================
--- a/wafhelpers/check_openssl.py
+++ b/wafhelpers/check_openssl.py
@@ -43,7 +43,6 @@ def configure_ssl(ctx):
 			fragment	= OPENSSL_FRAG % "\n".join(["#include <%s>" % x for x in headers]),
 			define_name = "HAVE_OPENSSL",
 			execute     = True,
-			define_ret  = False,
 			mandatory	= False,
 			use			= "SSL CRYPTO",
 			msg			= "Checking if OpenSSL works",



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/0b5db7f55c6070cb965f9e3cfad538279eceaa41...1ce7f4ddbc07de66362910da0a0bf3fc40de1355
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20161215/d088fb24/attachment.html>