Mark Favas reported that gcc caught me using casts as lvalues. Dodge it.
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 8b51aab..65a28cb 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -36,7 +36,7 @@
PyObject *
PyString_FromStringAndSize(const char *str, int size)
{
- PyStringObject *op;
+ register PyStringObject *op;
#ifndef DONT_SHARE_SHORT_STRINGS
if (size == 0 && (op = nullstring) != NULL) {
#ifdef COUNT_ALLOCS
@@ -73,11 +73,13 @@
op->ob_sval[size] = '\0';
#ifndef DONT_SHARE_SHORT_STRINGS
if (size == 0) {
- PyString_InternInPlace(&(PyObject *)op);
+ PyObject *t = (PyObject *)op;
+ PyString_InternInPlace(&t);
nullstring = op;
Py_INCREF(op);
} else if (size == 1 && str != NULL) {
- PyString_InternInPlace(&(PyObject *)op);
+ PyObject *t = (PyObject *)op;
+ PyString_InternInPlace(&t);
characters[*str & UCHAR_MAX] = op;
Py_INCREF(op);
}
@@ -89,7 +91,7 @@
PyString_FromString(const char *str)
{
register size_t size = strlen(str);
- PyStringObject *op;
+ register PyStringObject *op;
if (size > INT_MAX) {
PyErr_SetString(PyExc_OverflowError,
"string is too long for a Python string");
@@ -127,11 +129,13 @@
strcpy(op->ob_sval, str);
#ifndef DONT_SHARE_SHORT_STRINGS
if (size == 0) {
- PyString_InternInPlace(&(PyObject *)op);
+ PyObject *t = (PyObject *)op;
+ PyString_InternInPlace(&t);
nullstring = op;
Py_INCREF(op);
} else if (size == 1) {
- PyString_InternInPlace(&(PyObject *)op);
+ PyObject *t = (PyObject *)op;
+ PyString_InternInPlace(&t);
characters[*str & UCHAR_MAX] = op;
Py_INCREF(op);
}