Relax _PyBytesWriter API

vstinner · vstinner · commit c29e29bed1ea · 2015-10-12T13:12:54.000+02:00
Don't require _PyBytesWriter pointer to be a "char *". Same change for
_PyBytesWriter_WriteBytes() parameter.

For example, binascii uses "unsigned char*".
diff --git a/Include/bytesobject.h b/Include/bytesobject.h
@@ -156,30 +156,30 @@ PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer);
    Return a bytes object.
    Raise an exception and return NULL on error. */
 PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer,
-    char *str);
+    void *str);
 
 /* Deallocate memory of a writer (clear its internal buffer). */
 PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer);
 
 /* Allocate the buffer to write size bytes.
    Return the pointer to the beginning of buffer data.
    Raise an exception and return NULL on error. */
-PyAPI_FUNC(char*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
+PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer,
     Py_ssize_t size);
 
 /* Add *size* bytes to the buffer.
    str is the current pointer inside the buffer.
    Return the updated current pointer inside the buffer.
    Raise an exception and return NULL on error. */
-PyAPI_FUNC(char*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
-    char *str,
+PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer,
+    void *str,
     Py_ssize_t size);
 
 /* Write bytes.
    Raise an exception and return NULL on error. */
-PyAPI_FUNC(char*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
-    char *str,
-    char *bytes,
+PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer,
+    void *str,
+    const void *bytes,
     Py_ssize_t size);
 #endif   /* Py_LIMITED_API */
 
diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c
@@ -3923,8 +3923,8 @@ _PyBytesWriter_CheckConsistency(_PyBytesWriter *writer, char *str)
 #endif
 }
 
-char*
-_PyBytesWriter_Prepare(_PyBytesWriter *writer, char *str, Py_ssize_t size)
+void*
+_PyBytesWriter_Prepare(_PyBytesWriter *writer, void *str, Py_ssize_t size)
 {
     Py_ssize_t allocated, pos;
 
@@ -3992,7 +3992,7 @@ _PyBytesWriter_Prepare(_PyBytesWriter *writer, char *str, Py_ssize_t size)
 /* Allocate the buffer to write size bytes.
    Return the pointer to the beginning of buffer data.
    Raise an exception and return NULL on error. */
-char*
+void*
 _PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size)
 {
     /* ensure that _PyBytesWriter_Alloc() is only called once */
@@ -4011,7 +4011,7 @@ _PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size)
 }
 
 PyObject *
-_PyBytesWriter_Finish(_PyBytesWriter *writer, char *str)
+_PyBytesWriter_Finish(_PyBytesWriter *writer, void *str)
 {
     Py_ssize_t pos;
     PyObject *result;
@@ -4033,13 +4033,12 @@ _PyBytesWriter_Finish(_PyBytesWriter *writer, char *str)
     else {
         result = PyBytes_FromStringAndSize(writer->small_buffer, pos);
     }
-
     return result;
 }
 
-char*
-_PyBytesWriter_WriteBytes(_PyBytesWriter *writer, char *str,
-                          char *bytes, Py_ssize_t size)
+void*
+_PyBytesWriter_WriteBytes(_PyBytesWriter *writer, void *str,
+                          const void *bytes, Py_ssize_t size)
 {
     str = _PyBytesWriter_Prepare(writer, str, size);
     if (str == NULL)

Original file line number	Diff line number	Diff line change
`@@ -3923,8 +3923,8 @@ _PyBytesWriter_CheckConsistency(_PyBytesWriter writer, char str)`
`3923`	`3923`	`#endif`
`3924`	`3924`	`}`
`3925`	`3925`
`3926`		`-char*`
`3927`		`-_PyBytesWriter_Prepare(_PyBytesWriter writer, char str, Py_ssize_t size)`
	`3926`	`+void*`
	`3927`	`+_PyBytesWriter_Prepare(_PyBytesWriter writer, void str, Py_ssize_t size)`
`3928`	`3928`	`{`
`3929`	`3929`	`Py_ssize_t allocated, pos;`
`3930`	`3930`
`@@ -3992,7 +3992,7 @@ _PyBytesWriter_Prepare(_PyBytesWriter writer, char str, Py_ssize_t size)`
`3992`	`3992`	`/* Allocate the buffer to write size bytes.`
`3993`	`3993`	`Return the pointer to the beginning of buffer data.`
`3994`	`3994`	`Raise an exception and return NULL on error. */`
`3995`		`-char*`
	`3995`	`+void*`
`3996`	`3996`	`_PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size)`
`3997`	`3997`	`{`
`3998`	`3998`	`/* ensure that _PyBytesWriter_Alloc() is only called once */`
`@@ -4011,7 +4011,7 @@ _PyBytesWriter_Alloc(_PyBytesWriter *writer, Py_ssize_t size)`
`4011`	`4011`	`}`
`4012`	`4012`
`4013`	`4013`	`PyObject *`
`4014`		`-_PyBytesWriter_Finish(_PyBytesWriter writer, char str)`
	`4014`	`+_PyBytesWriter_Finish(_PyBytesWriter writer, void str)`
`4015`	`4015`	`{`
`4016`	`4016`	`Py_ssize_t pos;`
`4017`	`4017`	`PyObject *result;`
`@@ -4033,13 +4033,12 @@ _PyBytesWriter_Finish(_PyBytesWriter writer, char str)`
`4033`	`4033`	`else {`
`4034`	`4034`	`result = PyBytes_FromStringAndSize(writer->small_buffer, pos);`
`4035`	`4035`	`}`
`4036`		`-`
`4037`	`4036`	`return result;`
`4038`	`4037`	`}`
`4039`	`4038`
`4040`		`-char*`
`4041`		`-_PyBytesWriter_WriteBytes(_PyBytesWriter writer, char str,`
`4042`		`- char *bytes, Py_ssize_t size)`
	`4039`	`+void*`
	`4040`	`+_PyBytesWriter_WriteBytes(_PyBytesWriter writer, void str,`
	`4041`	`+ const void *bytes, Py_ssize_t size)`
`4043`	`4042`	`{`
`4044`	`4043`	`str = _PyBytesWriter_Prepare(writer, str, size);`
`4045`	`4044`	`if (str == NULL)`