mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

C++ compiler changes. casts, rename variables with reserved names.

Browse source
This commit is contained in:
Anthony Baxter 2006-04-13 07:19:01 +00:00
parent 3c6e4188ed
commit 7cbc0f5524
3 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/_hotshot.c
View file

@ -308,7 +308,7 @@ unpack_string(LogReaderObject *self, PyObject **pvalue)
if ((err = unpack_packed_int(self, &len, 0)))
return err;
buf = malloc(len);
buf = (char *)malloc(len);
for (i=0; i < len; i++) {
ch = fgetc(self->logfp);
buf[i] = ch;
@ -1403,7 +1403,7 @@ get_version_string(void)
++rev;
while (rev[i] != ' ' && rev[i] != '\0')
++i;
buffer = malloc(i + 1);
buffer = (char *)malloc(i + 1);
if (buffer != NULL) {
memmove(buffer, rev, i);
buffer[i] = '\0';

58
Modules/stropmodule.c
View file

@ -446,16 +446,16 @@ strop_lower(PyObject *self, PyObject *args)
{
char *s, *s_new;
Py_ssize_t i, n;
PyObject *new;
PyObject *newstr;
int changed;
WARN;
if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
new = PyString_FromStringAndSize(NULL, n);
if (new == NULL)
newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
s_new = PyString_AsString(new);
s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@ -467,11 +467,11 @@ strop_lower(PyObject *self, PyObject *args)
s_new++;
}
if (!changed) {
Py_DECREF(new);
Py_DECREF(newstr);
Py_INCREF(args);
return args;
}
return new;
return newstr;
}
@ -485,16 +485,16 @@ strop_upper(PyObject *self, PyObject *args)
{
char *s, *s_new;
Py_ssize_t i, n;
PyObject *new;
PyObject *newstr;
int changed;
WARN;
if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
new = PyString_FromStringAndSize(NULL, n);
if (new == NULL)
newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
s_new = PyString_AsString(new);
s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@ -506,11 +506,11 @@ strop_upper(PyObject *self, PyObject *args)
s_new++;
}
if (!changed) {
Py_DECREF(new);
Py_DECREF(newstr);
Py_INCREF(args);
return args;
}
return new;
return newstr;
}
@ -525,16 +525,16 @@ strop_capitalize(PyObject *self, PyObject *args)
{
char *s, *s_new;
Py_ssize_t i, n;
PyObject *new;
PyObject *newstr;
int changed;
WARN;
if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
new = PyString_FromStringAndSize(NULL, n);
if (new == NULL)
newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
s_new = PyString_AsString(new);
s_new = PyString_AsString(newstr);
changed = 0;
if (0 < n) {
int c = Py_CHARMASK(*s++);
@ -555,11 +555,11 @@ strop_capitalize(PyObject *self, PyObject *args)
s_new++;
}
if (!changed) {
Py_DECREF(new);
Py_DECREF(newstr);
Py_INCREF(args);
return args;
}
return new;
return newstr;
}
@ -691,16 +691,16 @@ strop_swapcase(PyObject *self, PyObject *args)
{
char *s, *s_new;
Py_ssize_t i, n;
PyObject *new;
PyObject *newstr;
int changed;
WARN;
if (PyString_AsStringAndSize(args, &s, &n))
return NULL;
new = PyString_FromStringAndSize(NULL, n);
if (new == NULL)
newstr = PyString_FromStringAndSize(NULL, n);
if (newstr == NULL)
return NULL;
s_new = PyString_AsString(new);
s_new = PyString_AsString(newstr);
changed = 0;
for (i = 0; i < n; i++) {
int c = Py_CHARMASK(*s++);
@ -717,11 +717,11 @@ strop_swapcase(PyObject *self, PyObject *args)
s_new++;
}
if (!changed) {
Py_DECREF(new);
Py_DECREF(newstr);
Py_INCREF(args);
return args;
}
return new;
return newstr;
}
@ -1141,7 +1141,7 @@ strop_replace(PyObject *self, PyObject *args)
char *str, *pat,*sub,*new_s;
Py_ssize_t len,pat_len,sub_len,out_len;
Py_ssize_t count = -1;
PyObject *new;
PyObject *newstr;
WARN;
if (!PyArg_ParseTuple(args, "t#t#t#|n:replace",
@ -1165,14 +1165,14 @@ strop_replace(PyObject *self, PyObject *args)
}
if (out_len == -1) {
/* we're returning another reference to the input string */
new = PyTuple_GetItem(args, 0);
Py_XINCREF(new);
newstr = PyTuple_GetItem(args, 0);
Py_XINCREF(newstr);
}
else {
new = PyString_FromStringAndSize(new_s, out_len);
newstr = PyString_FromStringAndSize(new_s, out_len);
PyMem_FREE(new_s);
}
return new;
return newstr;
}

2
Modules/timemodule.c
View file

@ -443,7 +443,7 @@ time_strftime(PyObject *self, PyObject *args)
* will be ahead of time...
*/
for (i = 1024; ; i += i) {
outbuf = malloc(i);
outbuf = (char *)malloc(i);
if (outbuf == NULL) {
return PyErr_NoMemory();
}