Avoid the keyword 'export'

Author: vstinner

Include/cpython/longintrepr.h

@@ -175,8 +175,11 @@ typedef struct PyUnstable_LongExport {
     Py_digit *digits;
 } PyUnstable_LongExport;
 
-PyAPI_FUNC(int) PyUnstable_Long_Export(PyLongObject *obj, PyUnstable_LongExport *export);
-PyAPI_FUNC(void) PyUnstable_Long_ReleaseExport(PyUnstable_LongExport *export);
+PyAPI_FUNC(int) PyUnstable_Long_Export(
+    PyLongObject *obj,
+    PyUnstable_LongExport *long_export);
+PyAPI_FUNC(void) PyUnstable_Long_ReleaseExport(
+    PyUnstable_LongExport *long_export);
 
 #ifdef __cplusplus
 }

Modules/_testcapi/long.c

@@ -168,14 +168,14 @@ pylong_export(PyObject *module, PyObject *obj)
         return NULL;
     }
 
-    PyUnstable_LongExport export;
-    if (PyUnstable_Long_Export((PyLongObject*)obj, &export) < 0) {
+    PyUnstable_LongExport long_export;
+    if (PyUnstable_Long_Export((PyLongObject*)obj, &long_export) < 0) {
         return NULL;
     }
 
     PyObject *digits = PyList_New(0);
-    for (size_t i=0; i < export.ndigits; i++) {
-        PyObject *digit = PyLong_FromUnsignedLong(export.digits[i]);
+    for (size_t i=0; i < long_export.ndigits; i++) {
+        PyObject *digit = PyLong_FromUnsignedLong(long_export.digits[i]);
         if (digit == NULL) {
             Py_DECREF(digits);
             goto error;
@@ -189,12 +189,12 @@ pylong_export(PyObject *module, PyObject *obj)
         Py_DECREF(digit);
     }
 
-    PyObject *res = Py_BuildValue("(iN)", export.negative, digits);
-    PyUnstable_Long_ReleaseExport(&export);
+    PyObject *res = Py_BuildValue("(iN)", long_export.negative, digits);
+    PyUnstable_Long_ReleaseExport(&long_export);
     return res;
 
 error:
-    PyUnstable_Long_ReleaseExport(&export);
+    PyUnstable_Long_ReleaseExport(&long_export);
     return NULL;
 }
 

Objects/longobject.c

@@ -6702,26 +6702,26 @@ PyUnstable_Long_Import(int negative, size_t ndigits, Py_digit *digits)
 
 
 int
-PyUnstable_Long_Export(PyLongObject *obj, PyUnstable_LongExport *export)
+PyUnstable_Long_Export(PyLongObject *obj, PyUnstable_LongExport *long_export)
 {
     assert(PyLong_Check(obj));
 
-    export->obj = (PyLongObject*)Py_NewRef(obj);
-    export->negative = _PyLong_IsNegative(obj);
-    export->ndigits = _PyLong_DigitCount(obj);
-    if (export->ndigits == 0) {
-        export->ndigits = 1;
+    long_export->obj = (PyLongObject*)Py_NewRef(obj);
+    long_export->negative = _PyLong_IsNegative(obj);
+    long_export->ndigits = _PyLong_DigitCount(obj);
+    if (long_export->ndigits == 0) {
+        long_export->ndigits = 1;
     }
-    export->digits = obj->long_value.ob_digit;
+    long_export->digits = obj->long_value.ob_digit;
     return 0;
 }
 
 
 void
-PyUnstable_Long_ReleaseExport(PyUnstable_LongExport *export)
+PyUnstable_Long_ReleaseExport(PyUnstable_LongExport *long_export)
 {
-    Py_CLEAR(export->obj);
-    export->negative = 0;
-    export->ndigits = 0;
-    export->digits = NULL;
+    Py_CLEAR(long_export->obj);
+    long_export->negative = 0;
+    long_export->ndigits = 0;
+    long_export->digits = NULL;
 }