[Python-checkins] python/dist/src/Objects stringobject.c, 2.218, 2.219

Sun Jun 27 13:24:52 EDT 2004

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31535/Objects
Modified Files:
	stringobject.c 
Log Message:
sizeof(char) is 1, by definition, so get rid of that expression in
places it's just noise.
Index: stringobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/stringobject.c,v
retrieving revision 2.218
retrieving revision 2.219
diff -C2 -d -r2.218 -r2.219
*** stringobject.c	8 Jun 2004 18:52:54 -0000	2.218
--- stringobject.c	27 Jun 2004 17:24:49 -0000	2.219
***************
*** 71,76 ****
 
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
 	if (op == NULL)
 		return PyErr_NoMemory();
--- 71,75 ----
 
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
 	if (op == NULL)
 		return PyErr_NoMemory();
***************
*** 127,132 ****
 
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
 	if (op == NULL)
 		return PyErr_NoMemory();
--- 126,130 ----
 
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
 	if (op == NULL)
 		return PyErr_NoMemory();
***************
*** 800,804 ****
 {
 	register PyStringObject* op = (PyStringObject*) obj;
! 	size_t newsize = 2 + 4 * op->ob_size * sizeof(char);
 	PyObject *v;
 	if (newsize > INT_MAX) {
--- 798,802 ----
 {
 	register PyStringObject* op = (PyStringObject*) obj;
! 	size_t newsize = 2 + 4 * op->ob_size;
 	PyObject *v;
 	if (newsize > INT_MAX) {
***************
*** 912,917 ****
 	size = a->ob_size + b->ob_size;
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)
! 		PyObject_MALLOC(sizeof(PyStringObject) + size * sizeof(char));
 	if (op == NULL)
 		return PyErr_NoMemory();
--- 910,914 ----
 	size = a->ob_size + b->ob_size;
 	/* Inline PyObject_NewVar */
! 	op = (PyStringObject *)PyObject_MALLOC(sizeof(PyStringObject) + size);
 	if (op == NULL)
 		return PyErr_NoMemory();
***************
*** 949,955 ****
 		return (PyObject *)a;
 	}
! 	nbytes = size * sizeof(char);
! 	if (nbytes / sizeof(char) != (size_t)size ||
! 	 nbytes + sizeof(PyStringObject) <= nbytes) {
 		PyErr_SetString(PyExc_OverflowError,
 			"repeated string is too long");
--- 946,951 ----
 		return (PyObject *)a;
 	}
! 	nbytes = (size_t)size;
! 	if (nbytes + sizeof(PyStringObject) <= nbytes) {
 		PyErr_SetString(PyExc_OverflowError,
 			"repeated string is too long");
***************
*** 3496,3501 ****
 	_Py_ForgetReference(v);
 	*pv = (PyObject *)
! 		PyObject_REALLOC((char *)v,
! 			sizeof(PyStringObject) + newsize * sizeof(char));
 	if (*pv == NULL) {
 		PyObject_Del(v);
--- 3492,3496 ----
 	_Py_ForgetReference(v);
 	*pv = (PyObject *)
! 		PyObject_REALLOC((char *)v, sizeof(PyStringObject) + newsize);
 	if (*pv == NULL) {
 		PyObject_Del(v);