[Python-checkins] bpo-31849: Fix warning in pyhash.c (GH-6799)

Mon Jun 4 06:57:11 EDT 2018

https://github.com/python/cpython/commit/a8eb58546b37a7cd5f332f019bb07388f5212c2d
commit: a8eb58546b37a7cd5f332f019bb07388f5212c2d
branch: master
author: A. Jesse Jiryu Davis <jesse at emptysquare.net>
committer: INADA Naoki <methane at users.noreply.github.com>
date: 2018年06月04日T19:57:08+09:00
summary:
bpo-31849: Fix warning in pyhash.c (GH-6799)
files:
A Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst
M Python/pyhash.c

diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst b/Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst
new file mode 100644
index 000000000000..876a3cf0aa13
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2018-05-14-11-00-00.bpo-31849.EmHaH4.rst	
@@ -0,0 +1 @@
+Fix signed/unsigned comparison warning in pyhash.c.
diff --git a/Python/pyhash.c b/Python/pyhash.c
index 6fc12fde3fc7..4c0b929586fc 100644
--- a/Python/pyhash.c
+++ b/Python/pyhash.c
@@ -272,8 +272,8 @@ fnv(const void *src, Py_ssize_t len)
 x = (_PyHASH_MULTIPLIER * x) ^ (Py_uhash_t) *p++;
 x ^= (Py_uhash_t) len;
 x ^= (Py_uhash_t) _Py_HashSecret.fnv.suffix;
- if (x == -1) {
- x = -2;
+ if (x == (Py_uhash_t) -1) {
+ x = (Py_uhash_t) -2;
 }
 return x;
 }
