Patchwork D7964: cext: change two more vars to Py_ssize_t in manifest.c

login
register
mail settings
Submitter phabricator
Date Jan. 21, 2020, 8:25 p.m.
Message ID <differential-rev-PHID-DREV-zj3xwyvzrbahltiuldok-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/44561/
State Superseded
Headers show

Comments

phabricator - Jan. 21, 2020, 8:25 p.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  D7913 <https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7964

AFFECTED FILES
  mercurial/cext/manifest.c

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel
phabricator - Jan. 22, 2020, 3:14 p.m.
pulkit added a comment.
pulkit added subscribers: martinvonz, durin42, pulkit.


  This should go to stable branch right?
  cc: @martinvonz @durin42

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7964/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7964

To: spectral, #hg-reviewers
Cc: pulkit, durin42, martinvonz, mercurial-devel
phabricator - Jan. 22, 2020, 3:55 p.m.
durin42 added a comment.


  Yes, I'll move this to stable.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7964/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7964

To: spectral, #hg-reviewers
Cc: pulkit, durin42, martinvonz, mercurial-devel

Patch

diff --git a/mercurial/cext/manifest.c b/mercurial/cext/manifest.c
--- a/mercurial/cext/manifest.c
+++ b/mercurial/cext/manifest.c
@@ -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;