mirror of https://github.com/python/cpython
bpo-46670: Remove unused macros in the Modules directory (GH-31194)
* bpo-46670: Remove unused macros in the Modules directory * Add again LINKAT_DIR_FD_CONVERTER: generated by Argument Clinic
This commit is contained in:
parent
d3e53bc532
commit
4f1d3f33dd
|
@ -504,7 +504,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
|
||||||
if (stgdict->format == NULL)
|
if (stgdict->format == NULL)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
#define realdict ((PyObject *)&stgdict->dict)
|
|
||||||
for (i = 0; i < len; ++i) {
|
for (i = 0; i < len; ++i) {
|
||||||
PyObject *name = NULL, *desc = NULL;
|
PyObject *name = NULL, *desc = NULL;
|
||||||
PyObject *pair = PySequence_GetItem(fields, i);
|
PyObject *pair = PySequence_GetItem(fields, i);
|
||||||
|
@ -635,7 +634,6 @@ PyCStructUnionType_update_stgdict(PyObject *type, PyObject *fields, int isStruct
|
||||||
Py_DECREF(pair);
|
Py_DECREF(pair);
|
||||||
Py_DECREF(prop);
|
Py_DECREF(prop);
|
||||||
}
|
}
|
||||||
#undef realdict
|
|
||||||
|
|
||||||
if (isStruct && !isPacked) {
|
if (isStruct && !isPacked) {
|
||||||
char *ptr = stgdict->format;
|
char *ptr = stgdict->format;
|
||||||
|
|
|
@ -40,8 +40,6 @@
|
||||||
#define PySSL_BEGIN_ALLOW_THREADS { \
|
#define PySSL_BEGIN_ALLOW_THREADS { \
|
||||||
PyThreadState *_save = NULL; \
|
PyThreadState *_save = NULL; \
|
||||||
PySSL_BEGIN_ALLOW_THREADS_S(_save);
|
PySSL_BEGIN_ALLOW_THREADS_S(_save);
|
||||||
#define PySSL_BLOCK_THREADS PySSL_END_ALLOW_THREADS_S(_save);
|
|
||||||
#define PySSL_UNBLOCK_THREADS PySSL_BEGIN_ALLOW_THREADS_S(_save);
|
|
||||||
#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
|
#define PySSL_END_ALLOW_THREADS PySSL_END_ALLOW_THREADS_S(_save); }
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2065,8 +2065,6 @@ static PyMemberDef s_members[] = {
|
||||||
{NULL} /* sentinel */
|
{NULL} /* sentinel */
|
||||||
};
|
};
|
||||||
|
|
||||||
#define OFF(x) offsetof(PyStructObject, x)
|
|
||||||
|
|
||||||
static PyGetSetDef s_getsetlist[] = {
|
static PyGetSetDef s_getsetlist[] = {
|
||||||
{"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
|
{"format", (getter)s_get_format, (setter)NULL, "struct format string", NULL},
|
||||||
{"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
|
{"size", (getter)s_get_size, (setter)NULL, "struct size in bytes", NULL},
|
||||||
|
|
|
@ -6060,8 +6060,6 @@ static PyMethodDef TestMethods[] = {
|
||||||
{NULL, NULL} /* sentinel */
|
{NULL, NULL} /* sentinel */
|
||||||
};
|
};
|
||||||
|
|
||||||
#define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);}
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
char bool_member;
|
char bool_member;
|
||||||
char byte_member;
|
char byte_member;
|
||||||
|
|
|
@ -318,10 +318,6 @@ typedef struct {
|
||||||
|
|
||||||
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
|
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
|
||||||
|
|
||||||
#define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
|
|
||||||
(void *) v, Py_REFCNT(v)))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**** Error Handling ****/
|
/**** Error Handling ****/
|
||||||
|
|
||||||
|
|
|
@ -84,7 +84,6 @@ mkpwent(PyObject *module, struct passwd *p)
|
||||||
if (v == NULL)
|
if (v == NULL)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
#define SETI(i,val) PyStructSequence_SET_ITEM(v, i, PyLong_FromLong((long) val))
|
|
||||||
#define SETS(i,val) sets(v, i, val)
|
#define SETS(i,val) sets(v, i, val)
|
||||||
|
|
||||||
SETS(setIndex++, p->pw_name);
|
SETS(setIndex++, p->pw_name);
|
||||||
|
@ -104,7 +103,6 @@ mkpwent(PyObject *module, struct passwd *p)
|
||||||
SETS(setIndex++, p->pw_shell);
|
SETS(setIndex++, p->pw_shell);
|
||||||
|
|
||||||
#undef SETS
|
#undef SETS
|
||||||
#undef SETI
|
|
||||||
|
|
||||||
if (PyErr_Occurred()) {
|
if (PyErr_Occurred()) {
|
||||||
Py_XDECREF(v);
|
Py_XDECREF(v);
|
||||||
|
|
Loading…
Reference in New Issue