[PATCH 1 of 5 foldmap-in-C V2] parsers: factor out most of asciilower into an internal function
Siddharth Agarwal
sid0 at fb.com
Wed Apr 1 20:59:59 UTC 2015
# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1427822729 25200
# Tue Mar 31 10:25:29 2015 -0700
# Node ID d624f49c6f5f4741b8cdd1b3c8a9d2a305893c8c
# Parent 9a023f039ed86ed4694174223b5f6c3965e99723
parsers: factor out most of asciilower into an internal function
We're going to reuse this in upcoming patches.
The change to Py_ssize_t is necessary because parsers.c doesn't define
PY_SSIZE_T_CLEAN. That macro changes the behavior of PyArg_ParseTuple but not
PyInt_AS_LONG.
diff --git a/mercurial/parsers.c b/mercurial/parsers.c
--- a/mercurial/parsers.c
+++ b/mercurial/parsers.c
@@ -93,14 +93,14 @@
return ret;
}
-static PyObject *asciilower(PyObject *self, PyObject *args)
+static inline PyObject *_asciilower(PyObject *str_obj)
{
char *str, *newstr;
- int i, len;
+ Py_ssize_t i, len;
PyObject *newobj = NULL;
- if (!PyArg_ParseTuple(args, "s#", &str, &len))
- goto quit;
+ str = PyBytes_AS_STRING(str_obj);
+ len = PyBytes_GET_SIZE(str_obj);
newobj = PyBytes_FromStringAndSize(NULL, len);
if (!newobj)
@@ -127,6 +127,14 @@
return NULL;
}
+static PyObject *asciilower(PyObject *self, PyObject *args)
+{
+ PyObject *str_obj;
+ if (!PyArg_ParseTuple(args, "O!:asciilower", &PyBytes_Type, &str_obj))
+ return NULL;
+ return _asciilower(str_obj);
+}
+
/*
* This code assumes that a manifest is stitched together with newline
* ('\n') characters.
More information about the Mercurial-devel
mailing list