cext: change two more vars to Py_ssize_t in manifest.c stable
authorKyle Lippincott <spectral@google.com>
Tue, 21 Jan 2020 12:10:35 -0800
branchstable
changeset 44132 f0a4084f82d6
parent 44131 3246cd5310b0
child 44133 1f8f215219ff
cext: change two more vars to Py_ssize_t in manifest.c D7913 fixed a compiler warning with a signedness conflict in a ternary operator by changing the types of some variables to be Py_ssize_t instead of size_t or int. That commit missed these two cases since they aren't warned about (at least on my compiler). Both of these variables are produced by operations on variables that are themselves Py_ssize_t now/already, so they should keep the same type. Differential Revision: https://phab.mercurial-scm.org/D7964
mercurial/cext/manifest.c
--- a/mercurial/cext/manifest.c	Tue Jan 21 13:16:30 2020 -0500
+++ b/mercurial/cext/manifest.c	Tue Jan 21 12:10:35 2020 -0800
@@ -80,7 +80,7 @@
 	PyObject *hash = nodeof(l);
 
 	/* 40 for hash, 1 for null byte, 1 for newline */
-	size_t hplen = plen + 42;
+	Py_ssize_t hplen = plen + 42;
 	Py_ssize_t flen = l->len - hplen;
 	PyObject *flags;
 	PyObject *tup;
@@ -525,7 +525,7 @@
 	PyObject *pyflags;
 	char *flags;
 	Py_ssize_t flen;
-	size_t dlen;
+	Py_ssize_t dlen;
 	char *dest;
 	int i;
 	line new;