Kaydet (Commit) 79912471 authored tarafından Fred Drake's avatar Fred Drake

ANSI-fication of the sources.

üst a83b68a1
This diff is collapsed.
...@@ -26,11 +26,7 @@ typedef struct { ...@@ -26,11 +26,7 @@ typedef struct {
static PyObject * static PyObject *
_PyBuffer_FromMemory(base, ptr, size, readonly) _PyBuffer_FromMemory(PyObject *base, void *ptr, int size, int readonly)
PyObject *base;
void *ptr;
int size;
int readonly;
{ {
PyBufferObject * b; PyBufferObject * b;
...@@ -57,12 +53,8 @@ _PyBuffer_FromMemory(base, ptr, size, readonly) ...@@ -57,12 +53,8 @@ _PyBuffer_FromMemory(base, ptr, size, readonly)
} }
static PyObject * static PyObject *
_PyBuffer_FromObject(base, offset, size, proc, readonly) _PyBuffer_FromObject(PyObject *base, int offset, int size,
PyObject *base; getreadbufferproc proc, int readonly)
int offset;
int size;
getreadbufferproc proc;
int readonly;
{ {
PyBufferProcs *pb = base->ob_type->tp_as_buffer; PyBufferProcs *pb = base->ob_type->tp_as_buffer;
void *p; void *p;
...@@ -100,10 +92,7 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly) ...@@ -100,10 +92,7 @@ _PyBuffer_FromObject(base, offset, size, proc, readonly)
PyObject * PyObject *
PyBuffer_FromObject(base, offset, size) PyBuffer_FromObject(PyObject *base, int offset, int size)
PyObject *base;
int offset;
int size;
{ {
PyBufferProcs *pb = base->ob_type->tp_as_buffer; PyBufferProcs *pb = base->ob_type->tp_as_buffer;
...@@ -120,10 +109,7 @@ PyBuffer_FromObject(base, offset, size) ...@@ -120,10 +109,7 @@ PyBuffer_FromObject(base, offset, size)
} }
PyObject * PyObject *
PyBuffer_FromReadWriteObject(base, offset, size) PyBuffer_FromReadWriteObject(PyObject *base, int offset, int size)
PyObject *base;
int offset;
int size;
{ {
PyBufferProcs *pb = base->ob_type->tp_as_buffer; PyBufferProcs *pb = base->ob_type->tp_as_buffer;
...@@ -141,24 +127,19 @@ PyBuffer_FromReadWriteObject(base, offset, size) ...@@ -141,24 +127,19 @@ PyBuffer_FromReadWriteObject(base, offset, size)
} }
PyObject * PyObject *
PyBuffer_FromMemory(ptr, size) PyBuffer_FromMemory(void *ptr, int size)
void *ptr;
int size;
{ {
return _PyBuffer_FromMemory(NULL, ptr, size, 1); return _PyBuffer_FromMemory(NULL, ptr, size, 1);
} }
PyObject * PyObject *
PyBuffer_FromReadWriteMemory(ptr, size) PyBuffer_FromReadWriteMemory(void *ptr, int size)
void *ptr;
int size;
{ {
return _PyBuffer_FromMemory(NULL, ptr, size, 0); return _PyBuffer_FromMemory(NULL, ptr, size, 0);
} }
PyObject * PyObject *
PyBuffer_New(size) PyBuffer_New(int size)
int size;
{ {
PyBufferObject * b; PyBufferObject * b;
...@@ -187,17 +168,14 @@ PyBuffer_New(size) ...@@ -187,17 +168,14 @@ PyBuffer_New(size)
/* Methods */ /* Methods */
static void static void
buffer_dealloc(self) buffer_dealloc(PyBufferObject *self)
PyBufferObject *self;
{ {
Py_XDECREF(self->b_base); Py_XDECREF(self->b_base);
PyObject_DEL(self); PyObject_DEL(self);
} }
static int static int
buffer_compare(self, other) buffer_compare(PyBufferObject *self, PyBufferObject *other)
PyBufferObject *self;
PyBufferObject *other;
{ {
int len_self = self->b_size; int len_self = self->b_size;
int len_other = other->b_size; int len_other = other->b_size;
...@@ -212,8 +190,7 @@ buffer_compare(self, other) ...@@ -212,8 +190,7 @@ buffer_compare(self, other)
} }
static PyObject * static PyObject *
buffer_repr(self) buffer_repr(PyBufferObject *self)
PyBufferObject *self;
{ {
char buf[300]; char buf[300];
char *status = self->b_readonly ? "read-only" : "read-write"; char *status = self->b_readonly ? "read-only" : "read-write";
...@@ -240,8 +217,7 @@ buffer_repr(self) ...@@ -240,8 +217,7 @@ buffer_repr(self)
} }
static long static long
buffer_hash(self) buffer_hash(PyBufferObject *self)
PyBufferObject *self;
{ {
register int len; register int len;
register unsigned char *p; register unsigned char *p;
...@@ -274,8 +250,7 @@ buffer_hash(self) ...@@ -274,8 +250,7 @@ buffer_hash(self)
} }
static PyObject * static PyObject *
buffer_str(self) buffer_str(PyBufferObject *self)
PyBufferObject *self;
{ {
return PyString_FromStringAndSize(self->b_ptr, self->b_size); return PyString_FromStringAndSize(self->b_ptr, self->b_size);
} }
...@@ -283,16 +258,13 @@ buffer_str(self) ...@@ -283,16 +258,13 @@ buffer_str(self)
/* Sequence methods */ /* Sequence methods */
static int static int
buffer_length(self) buffer_length(PyBufferObject *self)
PyBufferObject *self;
{ {
return self->b_size; return self->b_size;
} }
static PyObject * static PyObject *
buffer_concat(self, other) buffer_concat(PyBufferObject *self, PyObject *other)
PyBufferObject *self;
PyObject *other;
{ {
PyBufferProcs *pb = other->ob_type->tp_as_buffer; PyBufferProcs *pb = other->ob_type->tp_as_buffer;
char *p1; char *p1;
...@@ -344,9 +316,7 @@ buffer_concat(self, other) ...@@ -344,9 +316,7 @@ buffer_concat(self, other)
} }
static PyObject * static PyObject *
buffer_repeat(self, count) buffer_repeat(PyBufferObject *self, int count)
PyBufferObject *self;
int count;
{ {
PyObject *ob; PyObject *ob;
register char *p; register char *p;
...@@ -373,9 +343,7 @@ buffer_repeat(self, count) ...@@ -373,9 +343,7 @@ buffer_repeat(self, count)
} }
static PyObject * static PyObject *
buffer_item(self, idx) buffer_item(PyBufferObject *self, int idx)
PyBufferObject *self;
int idx;
{ {
if ( idx < 0 || idx >= self->b_size ) if ( idx < 0 || idx >= self->b_size )
{ {
...@@ -386,10 +354,7 @@ buffer_item(self, idx) ...@@ -386,10 +354,7 @@ buffer_item(self, idx)
} }
static PyObject * static PyObject *
buffer_slice(self, left, right) buffer_slice(PyBufferObject *self, int left, int right)
PyBufferObject *self;
int left;
int right;
{ {
if ( left < 0 ) if ( left < 0 )
left = 0; left = 0;
...@@ -410,10 +375,7 @@ buffer_slice(self, left, right) ...@@ -410,10 +375,7 @@ buffer_slice(self, left, right)
} }
static int static int
buffer_ass_item(self, idx, other) buffer_ass_item(PyBufferObject *self, int idx, PyObject *other)
PyBufferObject *self;
int idx;
PyObject *other;
{ {
PyBufferProcs *pb; PyBufferProcs *pb;
void *p; void *p;
...@@ -460,11 +422,7 @@ buffer_ass_item(self, idx, other) ...@@ -460,11 +422,7 @@ buffer_ass_item(self, idx, other)
} }
static int static int
buffer_ass_slice(self, left, right, other) buffer_ass_slice(PyBufferObject *self, int left, int right, PyObject *other)
PyBufferObject *self;
int left;
int right;
PyObject *other;
{ {
PyBufferProcs *pb; PyBufferProcs *pb;
void *p; void *p;
...@@ -521,10 +479,7 @@ buffer_ass_slice(self, left, right, other) ...@@ -521,10 +479,7 @@ buffer_ass_slice(self, left, right, other)
/* Buffer methods */ /* Buffer methods */
static int static int
buffer_getreadbuf(self, idx, pp) buffer_getreadbuf(PyBufferObject *self, int idx, void **pp)
PyBufferObject *self;
int idx;
void ** pp;
{ {
if ( idx != 0 ) { if ( idx != 0 ) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
...@@ -536,10 +491,7 @@ buffer_getreadbuf(self, idx, pp) ...@@ -536,10 +491,7 @@ buffer_getreadbuf(self, idx, pp)
} }
static int static int
buffer_getwritebuf(self, idx, pp) buffer_getwritebuf(PyBufferObject *self, int idx, void **pp)
PyBufferObject *self;
int idx;
void ** pp;
{ {
if ( self->b_readonly ) if ( self->b_readonly )
{ {
...@@ -550,9 +502,7 @@ buffer_getwritebuf(self, idx, pp) ...@@ -550,9 +502,7 @@ buffer_getwritebuf(self, idx, pp)
} }
static int static int
buffer_getsegcount(self, lenp) buffer_getsegcount(PyBufferObject *self, int *lenp)
PyBufferObject *self;
int *lenp;
{ {
if ( lenp ) if ( lenp )
*lenp = self->b_size; *lenp = self->b_size;
...@@ -560,10 +510,7 @@ buffer_getsegcount(self, lenp) ...@@ -560,10 +510,7 @@ buffer_getsegcount(self, lenp)
} }
static int static int
buffer_getcharbuf(self, idx, pp) buffer_getcharbuf(PyBufferObject *self, int idx, const char **pp)
PyBufferObject *self;
int idx;
const char ** pp;
{ {
if ( idx != 0 ) { if ( idx != 0 ) {
PyErr_SetString(PyExc_SystemError, PyErr_SetString(PyExc_SystemError,
...@@ -616,4 +563,3 @@ PyTypeObject PyBuffer_Type = { ...@@ -616,4 +563,3 @@ PyTypeObject PyBuffer_Type = {
Py_TPFLAGS_DEFAULT, /*tp_flags*/ Py_TPFLAGS_DEFAULT, /*tp_flags*/
0, /*tp_doc*/ 0, /*tp_doc*/
}; };
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment