summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2016-09-07 21:07:16 (GMT)
committerBrett Cannon <brett@python.org>2016-09-07 21:07:16 (GMT)
commit56be5f5376d19ffe1a3859f19577dcb6df00332f (patch)
treead9ccba39909f0469e53e354b00c633dd9c976ee
parent56b1f1b4d5edef1ca6184225145cffc59d2b3b5d (diff)
downloadcpython-56be5f5376d19ffe1a3859f19577dcb6df00332f.zip
cpython-56be5f5376d19ffe1a3859f19577dcb6df00332f.tar.gz
cpython-56be5f5376d19ffe1a3859f19577dcb6df00332f.tar.bz2
Eliminate a tautological-pointer-compare warning found by Clang.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_scproxy.c14
2 files changed, 7 insertions, 9 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 772cb7a..56d8434 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -97,6 +97,8 @@ Library
- Issue #16113: Add SHA-3 and SHAKE support to hashlib module.
+- Eliminate a tautological-pointer-compare warning in _scproxy.c.
+
- Issue #27776: The :func:`os.urandom` function does now block on Linux 3.17
and newer until the system urandom entropy pool is initialized to increase
the security. This change is part of the :pep:`524`.
diff --git a/Modules/_scproxy.c b/Modules/_scproxy.c
index 68be458..1ce4b77 100644
--- a/Modules/_scproxy.c
+++ b/Modules/_scproxy.c
@@ -71,16 +71,12 @@ get_proxy_settings(PyObject* mod __attribute__((__unused__)))
result = PyDict_New();
if (result == NULL) goto error;
- if (&kSCPropNetProxiesExcludeSimpleHostnames != NULL) {
- aNum = CFDictionaryGetValue(proxyDict,
- kSCPropNetProxiesExcludeSimpleHostnames);
- if (aNum == NULL) {
- v = PyBool_FromLong(0);
- } else {
- v = PyBool_FromLong(cfnum_to_int32(aNum));
- }
- } else {
+ aNum = CFDictionaryGetValue(proxyDict,
+ kSCPropNetProxiesExcludeSimpleHostnames);
+ if (aNum == NULL) {
v = PyBool_FromLong(0);
+ } else {
+ v = PyBool_FromLong(cfnum_to_int32(aNum));
}
if (v == NULL) goto error;