summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Vassalotti <alexandre@peadrop.com>2009-06-12 20:57:12 (GMT)
committerAlexandre Vassalotti <alexandre@peadrop.com>2009-06-12 20:57:12 (GMT)
commita6e3474d02639c13b42926e08aad0c85c531fe01 (patch)
tree22848e26cebc292aa79533cd174cc473dea433d5
parentc5ae86b9d3b6e348b6d0ee77c050134749a18ccc (diff)
downloadcpython-a6e3474d02639c13b42926e08aad0c85c531fe01.zip
cpython-a6e3474d02639c13b42926e08aad0c85c531fe01.tar.gz
cpython-a6e3474d02639c13b42926e08aad0c85c531fe01.tar.bz2
Add const qualifier to PyErr_SetFromErrnoWithFilename and to
PyErr_SetFromErrnoWithUnicodeFilename.
-rw-r--r--Include/pyerrors.h5
-rw-r--r--Python/errors.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index b55fb4e..fedf913 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -185,10 +185,11 @@ PyAPI_FUNC(PyObject *) PyErr_NoMemory(void);
PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *);
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject(
PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(PyObject *, char *);
+PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename(
+ PyObject *, const char *);
#ifdef MS_WINDOWS
PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename(
- PyObject *, Py_UNICODE *);
+ PyObject *, const Py_UNICODE *);
#endif /* MS_WINDOWS */
PyAPI_FUNC(PyObject *) PyErr_Format(PyObject *, const char *, ...)
diff --git a/Python/errors.c b/Python/errors.c
index 24dafca..9f040ad 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -371,7 +371,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
PyObject *
-PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename)
+PyErr_SetFromErrnoWithFilename(PyObject *exc, const char *filename)
{
PyObject *name = filename ? PyString_FromString(filename) : NULL;
PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
@@ -381,7 +381,7 @@ PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename)
#ifdef MS_WINDOWS
PyObject *
-PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, Py_UNICODE *filename)
+PyErr_SetFromErrnoWithUnicodeFilename(PyObject *exc, const Py_UNICODE *filename)
{
PyObject *name = filename ?
PyUnicode_FromUnicode(filename, wcslen(filename)) :