Rename static functions, they should not have the _Py prefix.

nascheme · nascheme · commit 9471c385a0f2 · 2004-03-11T00:44:54.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@35398 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
@@ -15,7 +15,7 @@ typedef struct {
 
 
 static PyObject *
-_PyBuffer_FromMemory(PyObject *base, void *ptr, int size, int readonly)
+buffer_from_memory(PyObject *base, void *ptr, int size, int readonly)
 {
 	PyBufferObject * b;
 
@@ -40,8 +40,8 @@ _PyBuffer_FromMemory(PyObject *base, void *ptr, int size, int readonly)
 }
 
 static PyObject *
-_PyBuffer_FromObject(PyObject *base, int offset, int size,
-                     getreadbufferproc proc, int readonly)
+buffer_from_object(PyObject *base, int offset, int size,
+		   getreadbufferproc proc, int readonly)
 {
 	PyBufferProcs *pb = base->ob_type->tp_as_buffer;
 	void *p;
@@ -76,7 +76,7 @@ _PyBuffer_FromObject(PyObject *base, int offset, int size,
 	if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) )
 		base = ((PyBufferObject *)base)->b_base;
 	
-	return _PyBuffer_FromMemory(base, (char *)p + offset, size, readonly);
+	return buffer_from_memory(base, (char *)p + offset, size, readonly);
 }
 
 
@@ -93,8 +93,7 @@ PyBuffer_FromObject(PyObject *base, int offset, int size)
 		return NULL;
 	}
 
-	return _PyBuffer_FromObject(base, offset, size,
-				    pb->bf_getreadbuffer, 1);
+	return buffer_from_object(base, offset, size, pb->bf_getreadbuffer, 1);
 }
 
 PyObject *
@@ -110,21 +109,21 @@ PyBuffer_FromReadWriteObject(PyObject *base, int offset, int size)
 		return NULL;
 	}
 
-	return _PyBuffer_FromObject(base, offset, size,
-				    (getreadbufferproc)pb->bf_getwritebuffer,
-				    0);
+	return buffer_from_object(base, offset, size,
+				  (getreadbufferproc)pb->bf_getwritebuffer,
+				  0);
 }
 
 PyObject *
 PyBuffer_FromMemory(void *ptr, int size)
 {
-	return _PyBuffer_FromMemory(NULL, ptr, size, 1);
+	return buffer_from_memory(NULL, ptr, size, 1);
 }
 
 PyObject *
 PyBuffer_FromReadWriteMemory(void *ptr, int size)
 {
-	return _PyBuffer_FromMemory(NULL, ptr, size, 0);
+	return buffer_from_memory(NULL, ptr, size, 0);
 }
 
 PyObject *

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ typedef struct {`
`15`	`15`
`16`	`16`
`17`	`17`	`static PyObject *`
`18`		`-_PyBuffer_FromMemory(PyObject base, void ptr, int size, int readonly)`
	`18`	`+buffer_from_memory(PyObject base, void ptr, int size, int readonly)`
`19`	`19`	`{`
`20`	`20`	`PyBufferObject * b;`
`21`	`21`
`@@ -40,8 +40,8 @@ _PyBuffer_FromMemory(PyObject base, void ptr, int size, int readonly)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`static PyObject *`
`43`		`-_PyBuffer_FromObject(PyObject *base, int offset, int size,`
`44`		`- getreadbufferproc proc, int readonly)`
	`43`	`+buffer_from_object(PyObject *base, int offset, int size,`
	`44`	`+ getreadbufferproc proc, int readonly)`
`45`	`45`	`{`
`46`	`46`	`PyBufferProcs *pb = base->ob_type->tp_as_buffer;`
`47`	`47`	`void *p;`
`@@ -76,7 +76,7 @@ _PyBuffer_FromObject(PyObject *base, int offset, int size,`
`76`	`76`	`if ( PyBuffer_Check(base) && (((PyBufferObject *)base)->b_base) )`
`77`	`77`	`base = ((PyBufferObject *)base)->b_base;`
`78`	`78`
`79`		`- return _PyBuffer_FromMemory(base, (char *)p + offset, size, readonly);`
	`79`	`+ return buffer_from_memory(base, (char *)p + offset, size, readonly);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`
`@@ -93,8 +93,7 @@ PyBuffer_FromObject(PyObject *base, int offset, int size)`
`93`	`93`	`return NULL;`
`94`	`94`	`}`
`95`	`95`
`96`		`- return _PyBuffer_FromObject(base, offset, size,`
`97`		`- pb->bf_getreadbuffer, 1);`
	`96`	`+ return buffer_from_object(base, offset, size, pb->bf_getreadbuffer, 1);`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`PyObject *`
`@@ -110,21 +109,21 @@ PyBuffer_FromReadWriteObject(PyObject *base, int offset, int size)`
`110`	`109`	`return NULL;`
`111`	`110`	`}`
`112`	`111`
`113`		`- return _PyBuffer_FromObject(base, offset, size,`
`114`		`- (getreadbufferproc)pb->bf_getwritebuffer,`
`115`		`- 0);`
	`112`	`+ return buffer_from_object(base, offset, size,`
	`113`	`+ (getreadbufferproc)pb->bf_getwritebuffer,`
	`114`	`+ 0);`
`116`	`115`	`}`
`117`	`116`
`118`	`117`	`PyObject *`
`119`	`118`	`PyBuffer_FromMemory(void *ptr, int size)`
`120`	`119`	`{`
`121`		`- return _PyBuffer_FromMemory(NULL, ptr, size, 1);`
	`120`	`+ return buffer_from_memory(NULL, ptr, size, 1);`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`PyObject *`
`125`	`124`	`PyBuffer_FromReadWriteMemory(void *ptr, int size)`
`126`	`125`	`{`
`127`		`- return _PyBuffer_FromMemory(NULL, ptr, size, 0);`
	`126`	`+ return buffer_from_memory(NULL, ptr, size, 0);`
`128`	`127`	`}`
`129`	`128`
`130`	`129`	`PyObject *`