D4841: cext: use modern buffer protocol in mpatch_flist()
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Tue Oct 2 20:14:24 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D4841
AFFECTED FILES
mercurial/cext/mpatch.c
CHANGE DETAILS
diff --git a/mercurial/cext/mpatch.c b/mercurial/cext/mpatch.c
--- a/mercurial/cext/mpatch.c
+++ b/mercurial/cext/mpatch.c
@@ -50,21 +50,22 @@
struct mpatch_flist *cpygetitem(void *bins, ssize_t pos)
{
- const char *buffer;
- struct mpatch_flist *res;
- ssize_t blen;
+ Py_buffer buffer;
+ struct mpatch_flist *res = NULL;
int r;
PyObject *tmp = PyList_GetItem((PyObject *)bins, pos);
if (!tmp)
return NULL;
- if (PyObject_AsCharBuffer(tmp, &buffer, (Py_ssize_t *)&blen))
+ if (PyObject_GetBuffer(tmp, &buffer, PyBUF_CONTIG_RO))
return NULL;
- if ((r = mpatch_decode(buffer, blen, &res)) < 0) {
+ if ((r = mpatch_decode(buffer.buf, buffer.len, &res)) < 0) {
if (!PyErr_Occurred())
setpyerr(r);
- return NULL;
+ res = NULL;
}
+
+ PyBuffer_Release(&buffer);
return res;
}
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list