[Python-checkins] python/dist/src/Objects bufferobject.c,2.20,2.21

nascheme at users.sourceforge.net nascheme at users.sourceforge.net
Wed Mar 10 19:44:57 EST 2004


Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12851

Modified Files:
	bufferobject.c 
Log Message:
Rename static functions, they should not have the _Py prefix.


Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.20
retrieving revision 2.21
diff -C2 -d -r2.20 -r2.21
*** bufferobject.c	19 Aug 2002 19:26:42 -0000	2.20
--- bufferobject.c	11 Mar 2004 00:44:54 -0000	2.21
***************
*** 16,20 ****
  
  static PyObject *
! _PyBuffer_FromMemory(PyObject *base, void *ptr, int size, int readonly)
  {
  	PyBufferObject * b;
--- 16,20 ----
  
  static PyObject *
! buffer_from_memory(PyObject *base, void *ptr, int size, int readonly)
  {
  	PyBufferObject * b;
***************
*** 41,46 ****
  
  static PyObject *
! _PyBuffer_FromObject(PyObject *base, int offset, int size,
!                      getreadbufferproc proc, int readonly)
  {
  	PyBufferProcs *pb = base->ob_type->tp_as_buffer;
--- 41,46 ----
  
  static PyObject *
! buffer_from_object(PyObject *base, int offset, int size,
! 		   getreadbufferproc proc, int readonly)
  {
  	PyBufferProcs *pb = base->ob_type->tp_as_buffer;
***************
*** 77,81 ****
  		base = ((PyBufferObject *)base)->b_base;
  	
! 	return _PyBuffer_FromMemory(base, (char *)p + offset, size, readonly);
  }
  
--- 77,81 ----
  		base = ((PyBufferObject *)base)->b_base;
  	
! 	return buffer_from_memory(base, (char *)p + offset, size, readonly);
  }
  
***************
*** 94,99 ****
  	}
  
! 	return _PyBuffer_FromObject(base, offset, size,
! 				    pb->bf_getreadbuffer, 1);
  }
  
--- 94,98 ----
  	}
  
! 	return buffer_from_object(base, offset, size, pb->bf_getreadbuffer, 1);
  }
  
***************
*** 111,117 ****
  	}
  
! 	return _PyBuffer_FromObject(base, offset, size,
! 				    (getreadbufferproc)pb->bf_getwritebuffer,
! 				    0);
  }
  
--- 110,116 ----
  	}
  
! 	return buffer_from_object(base, offset, size,
! 				  (getreadbufferproc)pb->bf_getwritebuffer,
! 				  0);
  }
  
***************
*** 119,123 ****
  PyBuffer_FromMemory(void *ptr, int size)
  {
! 	return _PyBuffer_FromMemory(NULL, ptr, size, 1);
  }
  
--- 118,122 ----
  PyBuffer_FromMemory(void *ptr, int size)
  {
! 	return buffer_from_memory(NULL, ptr, size, 1);
  }
  
***************
*** 125,129 ****
  PyBuffer_FromReadWriteMemory(void *ptr, int size)
  {
! 	return _PyBuffer_FromMemory(NULL, ptr, size, 0);
  }
  
--- 124,128 ----
  PyBuffer_FromReadWriteMemory(void *ptr, int size)
  {
! 	return buffer_from_memory(NULL, ptr, size, 0);
  }
  




More information about the Python-checkins mailing list