Skip to content

Commit

Permalink
GH-93207: Remove HAVE_STDARG_PROTOTYPES configure check for stdarg.h (#…
Browse files Browse the repository at this point in the history 
…93215)
  • Loading branch information
@kumaraditya303
kumaraditya303 committed May 27, 2022
1 parent ddc4a78 commit cb04a09
Show file tree
Hide file tree
Showing 19 changed files with 9 additions and 171 deletions.
5 changes: 5 additions & 0 deletions Doc/whatsnew/3.12.rst
View file
Expand Up @@ -144,6 +144,11 @@ Changes in the Python API
Build Changes
=============

* ``va_start()`` with two parameters, like ``va_start(args, format),``
is now required to build Python.
``va_start()`` is no longer called with a single parameter.
(Contributed by Kumar Aditya in :gh:`93207`.)


C API Changes
=============
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Build/2022-05-25-13-56-00.gh-issue-93207.B9Rubf.rst
View file
@@ -0,0 +1,3 @@
``va_start()`` with two parameters, like ``va_start(args, format),``
is now required to build Python. ``va_start()`` is no longer called with a single parameter.
Patch by Kumar Aditya.
4 changes: 0 additions & 4 deletions Modules/_asynciomodule.c
View file
Expand Up @@ -2643,11 +2643,7 @@ task_set_error_soon(TaskObj *task, PyObject *et, const char *format, ...)
PyObject* msg;

va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
msg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);

Expand Down
4 changes: 0 additions & 4 deletions Modules/_hashopenssl.c
View file
Expand Up @@ -255,11 +255,7 @@ _setException(PyObject *exc, const char* altmsg, ...)
const char *lib, *func, *reason;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, altmsg);
#else
va_start(vargs);
#endif
if (!errcode) {
if (altmsg == NULL) {
PyErr_SetString(exc, "no reason supplied");
Expand Down
4 changes: 0 additions & 4 deletions Objects/bytesobject.c
View file
Expand Up @@ -377,11 +377,7 @@ PyBytes_FromFormat(const char *format, ...)
PyObject* ret;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
ret = PyBytes_FromFormatV(format, vargs);
va_end(vargs);
return ret;
Expand Down
4 changes: 0 additions & 4 deletions Objects/exceptions.c
View file
Expand Up @@ -3816,11 +3816,7 @@ _PyErr_TrySetFromCause(const char *format, ...)
Py_DECREF(tb);
}

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
msg_prefix = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (msg_prefix == NULL) {
Expand Down
4 changes: 0 additions & 4 deletions Objects/unicodeobject.c
View file
Expand Up @@ -2708,11 +2708,7 @@ PyUnicode_FromFormat(const char *format, ...)
PyObject* ret;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
ret = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
return ret;
Expand Down
3 changes: 0 additions & 3 deletions PC/pyconfig.h
View file
Expand Up @@ -569,9 +569,6 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
/* Define to 1 if you have the <signal.h> header file. */
#define HAVE_SIGNAL_H 1

/* Define if you have the <stdarg.h> prototypes. */
#define HAVE_STDARG_PROTOTYPES

/* Define if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1

Expand Down
12 changes: 0 additions & 12 deletions Parser/tokenizer.c
View file
Expand Up @@ -1105,11 +1105,7 @@ static int
syntaxerror(struct tok_state *tok, const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
int ret = _syntaxerror_range(tok, format, -1, -1, vargs);
va_end(vargs);
return ret;
Expand All @@ -1121,11 +1117,7 @@ syntaxerror_known_range(struct tok_state *tok,
const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
int ret = _syntaxerror_range(tok, format, col_offset, end_col_offset, vargs);
va_end(vargs);
return ret;
Expand All @@ -1146,11 +1138,7 @@ parser_warn(struct tok_state *tok, PyObject *category, const char *format, ...)
{
PyObject *errmsg;
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
errmsg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (!errmsg) {
Expand Down
16 changes: 0 additions & 16 deletions Python/_warnings.c
View file
Expand Up @@ -1136,11 +1136,7 @@ PyErr_WarnFormat(PyObject *category, Py_ssize_t stack_level,
int res;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
res = _PyErr_WarnFormatV(NULL, category, stack_level, format, vargs);
va_end(vargs);
return res;
Expand All @@ -1153,11 +1149,7 @@ _PyErr_WarnFormat(PyObject *source, PyObject *category, Py_ssize_t stack_level,
int res;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
res = _PyErr_WarnFormatV(source, category, stack_level, format, vargs);
va_end(vargs);
return res;
Expand All @@ -1170,11 +1162,7 @@ PyErr_ResourceWarning(PyObject *source, Py_ssize_t stack_level,
int res;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
res = _PyErr_WarnFormatV(source, PyExc_ResourceWarning,
stack_level, format, vargs);
va_end(vargs);
Expand Down Expand Up @@ -1274,11 +1262,7 @@ PyErr_WarnExplicitFormat(PyObject *category,
goto exit;
}

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
message = PyUnicode_FromFormatV(format, vargs);
if (message != NULL) {
PyObject *res;
Expand Down
8 changes: 0 additions & 8 deletions Python/compile.c
View file
Expand Up @@ -6094,11 +6094,7 @@ static int
compiler_error(struct compiler *c, const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
PyObject *msg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (msg == NULL) {
Expand Down Expand Up @@ -6131,11 +6127,7 @@ static int
compiler_warn(struct compiler *c, const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
PyObject *msg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);
if (msg == NULL) {
Expand Down
16 changes: 0 additions & 16 deletions Python/errors.c
View file
Expand Up @@ -688,11 +688,7 @@ _PyErr_FormatFromCauseTstate(PyThreadState *tstate, PyObject *exception,
const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
_PyErr_FormatVFromCause(tstate, exception, format, vargs);
va_end(vargs);
return NULL;
Expand All @@ -703,11 +699,7 @@ _PyErr_FormatFromCause(PyObject *exception, const char *format, ...)
{
PyThreadState *tstate = _PyThreadState_GET();
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
_PyErr_FormatVFromCause(tstate, exception, format, vargs);
va_end(vargs);
return NULL;
Expand Down Expand Up @@ -1096,11 +1088,7 @@ _PyErr_Format(PyThreadState *tstate, PyObject *exception,
const char *format, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
_PyErr_FormatV(tstate, exception, format, vargs);
va_end(vargs);
return NULL;
Expand All @@ -1112,11 +1100,7 @@ PyErr_Format(PyObject *exception, const char *format, ...)
{
PyThreadState *tstate = _PyThreadState_GET();
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
_PyErr_FormatV(tstate, exception, format, vargs);
va_end(vargs);
return NULL;
Expand Down
8 changes: 0 additions & 8 deletions Python/getargs.c
View file
Expand Up @@ -2792,11 +2792,7 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
stack = _PyTuple_ITEMS(args);
nargs = PyTuple_GET_SIZE(args);

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, max);
#else
va_start(vargs);
#endif
retval = unpack_stack(stack, nargs, name, min, max, vargs);
va_end(vargs);
return retval;
Expand All @@ -2809,11 +2805,7 @@ _PyArg_UnpackStack(PyObject *const *args, Py_ssize_t nargs, const char *name,
int retval;
va_list vargs;

#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, max);
#else
va_start(vargs);
#endif
retval = unpack_stack(args, nargs, name, min, max, vargs);
va_end(vargs);
return retval;
Expand Down
4 changes: 0 additions & 4 deletions Python/hamt.c
View file
Expand Up @@ -496,11 +496,7 @@ _hamt_dump_format(_PyUnicodeWriter *writer, const char *format, ...)
int ret;

va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
msg = PyUnicode_FromFormatV(format, vargs);
va_end(vargs);

Expand Down
4 changes: 0 additions & 4 deletions Python/pylifecycle.c
View file
Expand Up @@ -2838,11 +2838,7 @@ _Py_FatalErrorFormat(const char *func, const char *format, ...)
}

va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, format);
#else
va_start(vargs);
#endif
vfprintf(stream, format, vargs);
va_end(vargs);

Expand Down
8 changes: 0 additions & 8 deletions Python/sysmodule.c
View file
Expand Up @@ -292,11 +292,7 @@ _PySys_Audit(PyThreadState *tstate, const char *event,
const char *argFormat, ...)
{
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, argFormat);
#else
va_start(vargs);
#endif
int res = sys_audit_tstate(tstate, event, argFormat, vargs);
va_end(vargs);
return res;
Expand All @@ -307,11 +303,7 @@ PySys_Audit(const char *event, const char *argFormat, ...)
{
PyThreadState *tstate = _PyThreadState_GET();
va_list vargs;
#ifdef HAVE_STDARG_PROTOTYPES
va_start(vargs, argFormat);
#else
va_start(vargs);
#endif
int res = sys_audit_tstate(tstate, event, argFormat, vargs);
va_end(vargs);
return res;
Expand Down
46 changes: 0 additions & 46 deletions configure
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cb04a09

Please sign in to comment.