Removing warnings found by gcc -Wall

This commit is contained in:
Moshe Zadka 2000-08-04 15:36:13 +00:00
parent 92a69138b3
commit cf703f04ad
2 changed files with 9 additions and 4 deletions

View File

@ -141,6 +141,7 @@ PyBuffer_FromReadWriteMemory(void *ptr, int size)
PyObject *
PyBuffer_New(int size)
{
PyObject *o;
PyBufferObject * b;
if (size < 0) {
@ -149,10 +150,10 @@ PyBuffer_New(int size)
return NULL;
}
/* PyObject_New is inlined */
b = (PyBufferObject *) PyObject_MALLOC(sizeof(*b) + size);
if ( b == NULL )
o = PyObject_MALLOC(sizeof(*b) + size);
if ( o == NULL )
return PyErr_NoMemory();
PyObject_INIT((PyObject *)b, &PyBuffer_Type);
b = (PyBufferObject *) PyObject_INIT(o, &PyBuffer_Type);
b->b_base = NULL;
b->b_ptr = (void *)(b + 1);
@ -162,7 +163,7 @@ PyBuffer_New(int size)
b->b_hash = -1;
#endif
return (PyObject *) b;
return o;
}
/* Methods */

View File

@ -1123,6 +1123,10 @@ _PyTrash_deposit_object(PyObject *op)
typecode = Py_TRASHCAN_FRAME;
else if (PyTraceBack_Check(op))
typecode = Py_TRASHCAN_TRACEBACK;
else /* We have a bug here -- those are the only types in GC */ {
Py_FatalError("Type not supported in GC -- internal bug");
return; /* pacify compiler -- execution never here */
}
op->ob_refcnt = typecode;
op->ob_type = (PyTypeObject*)_PyTrash_delete_later;