Merged revisions 84391 via svnmerge from

pitrou · pitrou · commit b83df8f1b7a3 · 2010-09-01T13:01:35.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84391 | antoine.pitrou | 2010-09-01 14:58:21 +0200 (mer., 01 sept. 2010) | 5 lines Issue #3101: Helper functions _add_one_to_C() and _add_one_to_F() become _Py_add_one_to_C() and _Py_add_one_to_F(), respectively. ........
diff --git a/Include/abstract.h b/Include/abstract.h
@@ -1233,6 +1233,13 @@ PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls);
 PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls);
 
 
+/* For internal use by buffer API functions */
+PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index,
+                                        const Py_ssize_t *shape);
+PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index,
+                                        const Py_ssize_t *shape);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -514,6 +514,9 @@ Extension Modules
 Build
 -----
 
+- Issue #3101: Helper functions _add_one_to_C() and _add_one_to_F() become
+  _Py_add_one_to_C() and _Py_add_one_to_F(), respectively.
+
 - Issue #9700: define HAVE_BROKEN_POSIX_SEMAPHORES under AIX 6.x.  Patch by
   Sébastien Sablé.
 
diff --git a/Objects/abstract.c b/Objects/abstract.c
@@ -413,7 +413,7 @@ PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices)
 
 
 void
-_add_one_to_index_F(int nd, Py_ssize_t *index, Py_ssize_t *shape)
+_Py_add_one_to_index_F(int nd, Py_ssize_t *index, const Py_ssize_t *shape)
 {
     int k;
 
@@ -429,7 +429,7 @@ _add_one_to_index_F(int nd, Py_ssize_t *index, Py_ssize_t *shape)
 }
 
 void
-_add_one_to_index_C(int nd, Py_ssize_t *index, Py_ssize_t *shape)
+_Py_add_one_to_index_C(int nd, Py_ssize_t *index, const Py_ssize_t *shape)
 {
     int k;
 
@@ -453,7 +453,7 @@ int
 PyBuffer_ToContiguous(void *buf, Py_buffer *view, Py_ssize_t len, char fort)
 {
     int k;
-    void (*addone)(int, Py_ssize_t *, Py_ssize_t *);
+    void (*addone)(int, Py_ssize_t *, const Py_ssize_t *);
     Py_ssize_t *indices, elements;
     char *dest, *ptr;
 
@@ -480,10 +480,10 @@ PyBuffer_ToContiguous(void *buf, Py_buffer *view, Py_ssize_t len, char fort)
     }
 
     if (fort == 'F') {
-        addone = _add_one_to_index_F;
+        addone = _Py_add_one_to_index_F;
     }
     else {
-        addone = _add_one_to_index_C;
+        addone = _Py_add_one_to_index_C;
     }
     dest = buf;
     /* XXX : This is not going to be the fastest code in the world
@@ -504,7 +504,7 @@ int
 PyBuffer_FromContiguous(Py_buffer *view, void *buf, Py_ssize_t len, char fort)
 {
     int k;
-    void (*addone)(int, Py_ssize_t *, Py_ssize_t *);
+    void (*addone)(int, Py_ssize_t *, const Py_ssize_t *);
     Py_ssize_t *indices, elements;
     char *src, *ptr;
 
@@ -531,10 +531,10 @@ PyBuffer_FromContiguous(Py_buffer *view, void *buf, Py_ssize_t len, char fort)
     }
 
     if (fort == 'F') {
-        addone = _add_one_to_index_F;
+        addone = _Py_add_one_to_index_F;
     }
     else {
-        addone = _add_one_to_index_C;
+        addone = _Py_add_one_to_index_C;
     }
     src = buf;
     /* XXX : This is not going to be the fastest code in the world
@@ -611,7 +611,7 @@ int PyObject_CopyData(PyObject *dest, PyObject *src)
         elements *= view_src.shape[k];
     }
     while (elements--) {
-        _add_one_to_index_C(view_src.ndim, indices, view_src.shape);
+        _Py_add_one_to_index_C(view_src.ndim, indices, view_src.shape);
         dptr = PyBuffer_GetPointer(&view_dest, indices);
         sptr = PyBuffer_GetPointer(&view_src, indices);
         memcpy(dptr, sptr, view_src.itemsize);
diff --git a/Objects/memoryobject.c b/Objects/memoryobject.c
@@ -172,9 +172,6 @@ _strided_copy_nd(char *dest, char *src, int nd, Py_ssize_t *shape,
     return;
 }
 
-void _add_one_to_index_F(int nd, Py_ssize_t *index, Py_ssize_t *shape);
-void _add_one_to_index_C(int nd, Py_ssize_t *index, Py_ssize_t *shape);
-
 static int
 _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
 {
@@ -203,10 +200,10 @@ _indirect_copy_nd(char *dest, Py_buffer *view, char fort)
         elements *= view->shape[k];
     }
     if (fort == 'F') {
-        func = _add_one_to_index_F;
+        func = _Py_add_one_to_index_F;
     }
     else {
-        func = _add_one_to_index_C;
+        func = _Py_add_one_to_index_C;
     }
     while (elements--) {
         func(view->ndim, indices, view->shape);

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ PyBuffer_GetPointer(Py_buffer view, Py_ssize_t indices)`
`413`	`413`
`414`	`414`
`415`	`415`	`void`
`416`		`-_add_one_to_index_F(int nd, Py_ssize_t index, Py_ssize_t shape)`
	`416`	`+_Py_add_one_to_index_F(int nd, Py_ssize_t index, const Py_ssize_t shape)`
`417`	`417`	`{`
`418`	`418`	`int k;`
`419`	`419`
`@@ -429,7 +429,7 @@ _add_one_to_index_F(int nd, Py_ssize_t index, Py_ssize_t shape)`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`void`
`432`		`-_add_one_to_index_C(int nd, Py_ssize_t index, Py_ssize_t shape)`
	`432`	`+_Py_add_one_to_index_C(int nd, Py_ssize_t index, const Py_ssize_t shape)`
`433`	`433`	`{`
`434`	`434`	`int k;`
`435`	`435`
`@@ -453,7 +453,7 @@ int`
`453`	`453`	`PyBuffer_ToContiguous(void buf, Py_buffer view, Py_ssize_t len, char fort)`
`454`	`454`	`{`
`455`	`455`	`int k;`
`456`		`- void (addone)(int, Py_ssize_t , Py_ssize_t *);`
	`456`	`+ void (addone)(int, Py_ssize_t , const Py_ssize_t *);`
`457`	`457`	`Py_ssize_t *indices, elements;`
`458`	`458`	`char dest, ptr;`
`459`	`459`
`@@ -480,10 +480,10 @@ PyBuffer_ToContiguous(void buf, Py_buffer view, Py_ssize_t len, char fort)`
`480`	`480`	`}`
`481`	`481`
`482`	`482`	`if (fort == 'F') {`
`483`		`- addone = _add_one_to_index_F;`
	`483`	`+ addone = _Py_add_one_to_index_F;`
`484`	`484`	`}`
`485`	`485`	`else {`
`486`		`- addone = _add_one_to_index_C;`
	`486`	`+ addone = _Py_add_one_to_index_C;`
`487`	`487`	`}`
`488`	`488`	`dest = buf;`
`489`	`489`	`/* XXX : This is not going to be the fastest code in the world`
`@@ -504,7 +504,7 @@ int`
`504`	`504`	`PyBuffer_FromContiguous(Py_buffer view, void buf, Py_ssize_t len, char fort)`
`505`	`505`	`{`
`506`	`506`	`int k;`
`507`		`- void (addone)(int, Py_ssize_t , Py_ssize_t *);`
	`507`	`+ void (addone)(int, Py_ssize_t , const Py_ssize_t *);`
`508`	`508`	`Py_ssize_t *indices, elements;`
`509`	`509`	`char src, ptr;`
`510`	`510`
`@@ -531,10 +531,10 @@ PyBuffer_FromContiguous(Py_buffer view, void buf, Py_ssize_t len, char fort)`
`531`	`531`	`}`
`532`	`532`
`533`	`533`	`if (fort == 'F') {`
`534`		`- addone = _add_one_to_index_F;`
	`534`	`+ addone = _Py_add_one_to_index_F;`
`535`	`535`	`}`
`536`	`536`	`else {`
`537`		`- addone = _add_one_to_index_C;`
	`537`	`+ addone = _Py_add_one_to_index_C;`
`538`	`538`	`}`
`539`	`539`	`src = buf;`
`540`	`540`	`/* XXX : This is not going to be the fastest code in the world`
`@@ -611,7 +611,7 @@ int PyObject_CopyData(PyObject dest, PyObject src)`
`611`	`611`	`elements *= view_src.shape[k];`
`612`	`612`	`}`
`613`	`613`	`while (elements--) {`
`614`		`- _add_one_to_index_C(view_src.ndim, indices, view_src.shape);`
	`614`	`+ _Py_add_one_to_index_C(view_src.ndim, indices, view_src.shape);`
`615`	`615`	`dptr = PyBuffer_GetPointer(&view_dest, indices);`
`616`	`616`	`sptr = PyBuffer_GetPointer(&view_src, indices);`
`617`	`617`	`memcpy(dptr, sptr, view_src.itemsize);`
Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,6 @@ _strided_copy_nd(char dest, char src, int nd, Py_ssize_t *shape,`
`172`	`172`	`return;`
`173`	`173`	`}`
`174`	`174`
`175`		`-void _add_one_to_index_F(int nd, Py_ssize_t index, Py_ssize_t shape);`
`176`		`-void _add_one_to_index_C(int nd, Py_ssize_t index, Py_ssize_t shape);`
`177`		`-`
`178`	`175`	`static int`
`179`	`176`	`_indirect_copy_nd(char dest, Py_buffer view, char fort)`
`180`	`177`	`{`
`@@ -203,10 +200,10 @@ _indirect_copy_nd(char dest, Py_buffer view, char fort)`
`203`	`200`	`elements *= view->shape[k];`
`204`	`201`	`}`
`205`	`202`	`if (fort == 'F') {`
`206`		`- func = _add_one_to_index_F;`
	`203`	`+ func = _Py_add_one_to_index_F;`
`207`	`204`	`}`
`208`	`205`	`else {`
`209`		`- func = _add_one_to_index_C;`
	`206`	`+ func = _Py_add_one_to_index_C;`
`210`	`207`	`}`
`211`	`208`	`while (elements--) {`
`212`	`209`	`func(view->ndim, indices, view->shape);`