This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6197

cext: make parsers.c PY_SSIZE_T_CLEAN
ClosedPublic

Authored by indygreg on Apr 4 2019, 6:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG896b19d12c08: cext: make parsers.c PY_SSIZE_T_CLEAN
Summary

This is needed to avoid a deprecation warning in Python 3.8. I believe
the conversion of int to Py_ssize_t is harmless in the changed
locations. But this being C code, it should be audited with care.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Apr 4 2019, 6:31 PM
pulkit accepted this revision.Apr 5 2019, 7:37 AM
Closed by commit rHG896b19d12c08: cext: make parsers.c PY_SSIZE_T_CLEAN (authored by indygreg). · Explain WhyApr 5 2019, 7:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (9 lines)

Diff 14670

mercurial/cext/parsers.c

/* /*
parsers.c - efficient content parsing parsers.c - efficient content parsing
Copyright 2008 Matt Mackall <mpm@selenic.com> and others Copyright 2008 Matt Mackall <mpm@selenic.com> and others
This software may be used and distributed according to the terms of This software may be used and distributed according to the terms of
the GNU General Public License, incorporated herein by reference. the GNU General Public License, incorporated herein by reference.
*/ */
#define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include <ctype.h> #include <ctype.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "bitmanipulation.h" #include "bitmanipulation.h"
#include "charencode.h" #include "charencode.h"
#include "util.h" #include "util.h"
}; };
static PyObject *parse_dirstate(PyObject *self, PyObject *args) static PyObject *parse_dirstate(PyObject *self, PyObject *args)
{ {
PyObject *dmap, *cmap, *parents = NULL, *ret = NULL; PyObject *dmap, *cmap, *parents = NULL, *ret = NULL;
PyObject *fname = NULL, *cname = NULL, *entry = NULL; PyObject *fname = NULL, *cname = NULL, *entry = NULL;
char state, *cur, *str, *cpos; char state, *cur, *str, *cpos;
int mode, size, mtime; int mode, size, mtime;
unsigned int flen, len, pos = 40; unsigned int flen, pos = 40;
int readlen; Py_ssize_t len = 40;
Py_ssize_t readlen;
if (!PyArg_ParseTuple( if (!PyArg_ParseTuple(
args, PY23("O!O!s#:parse_dirstate", "O!O!y#:parse_dirstate"), args, PY23("O!O!s#:parse_dirstate", "O!O!y#:parse_dirstate"),
&PyDict_Type, &dmap, &PyDict_Type, &cmap, &str, &readlen)) { &PyDict_Type, &dmap, &PyDict_Type, &cmap, &str, &readlen)) {
goto quit; goto quit;
} }
len = readlen; len = readlen;
Py_XDECREF(metadata); Py_XDECREF(metadata);
Py_XDECREF(parents); Py_XDECREF(parents);
return ret; return ret;
} }
static PyObject *fm1readmarkers(PyObject *self, PyObject *args) static PyObject *fm1readmarkers(PyObject *self, PyObject *args)
{ {
const char *data, *dataend; const char *data, *dataend;
int datalen; Py_ssize_t datalen, offset, stop;
Py_ssize_t offset, stop;
PyObject *markers = NULL; PyObject *markers = NULL;
if (!PyArg_ParseTuple(args, PY23("s#nn", "y#nn"), &data, &datalen, if (!PyArg_ParseTuple(args, PY23("s#nn", "y#nn"), &data, &datalen,
&offset, &stop)) { &offset, &stop)) {
return NULL; return NULL;
} }
if (offset < 0) { if (offset < 0) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,