Skip to content

C
cpython
Commit 23ae9874 authored by Jeremy Hylton's avatar Jeremy Hylton
Browse files
Options

Use PyOS_snprintf when possible.

parent 885d4577
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 34 deletions
Python/getargs.c
View file @ 23ae9874
...@@ -135,18 +135,19 @@ vgetargs1(PyObject *args, char *format, va_list *p_va, int compat) ...@@ -135,18 +135,19 @@ vgetargs1(PyObject *args, char *format, va_list *p_va, int compat)
if (max == 0) { if (max == 0) {
if (args == NULL) if (args == NULL)
return 1; return 1;
sprintf(msgbuf, "%.200s%s takes no arguments", PyOS_snprintf(msgbuf, sizeof(msgbuf),
fname==NULL ? "function" : fname, "%.200s%s takes no arguments",
fname==NULL ? "" : "()"); fname==NULL ? "function" : fname,
fname==NULL ? "" : "()");
PyErr_SetString(PyExc_TypeError, msgbuf); PyErr_SetString(PyExc_TypeError, msgbuf);
return 0; return 0;
} }
else if (min == 1 && max == 1) { else if (min == 1 && max == 1) {
if (args == NULL) { if (args == NULL) {
sprintf(msgbuf, PyOS_snprintf(msgbuf, sizeof(msgbuf),
"%.200s%s takes at least one argument", "%.200s%s takes at least one argument",
fname==NULL ? "function" : fname, fname==NULL ? "function" : fname,
fname==NULL ? "" : "()"); fname==NULL ? "" : "()");
PyErr_SetString(PyExc_TypeError, msgbuf); PyErr_SetString(PyExc_TypeError, msgbuf);
return 0; return 0;
} }
...@@ -173,15 +174,16 @@ vgetargs1(PyObject *args, char *format, va_list *p_va, int compat) ...@@ -173,15 +174,16 @@ vgetargs1(PyObject *args, char *format, va_list *p_va, int compat)
if (len < min || max < len) { if (len < min || max < len) {
if (message == NULL) { if (message == NULL) {
sprintf(msgbuf, PyOS_snprintf(msgbuf, sizeof(msgbuf),
"%.150s%s takes %s %d argument%s (%d given)", "%.150s%s takes %s %d argument%s "
fname==NULL ? "function" : fname, "(%d given)",
fname==NULL ? "" : "()", fname==NULL ? "function" : fname,
min==max ? "exactly" fname==NULL ? "" : "()",
: len < min ? "at least" : "at most", min==max ? "exactly"
len < min ? min : max, : len < min ? "at least" : "at most",
(len < min ? min : max) == 1 ? "" : "s", len < min ? min : max,
len); (len < min ? min : max) == 1 ? "" : "s",
len);
message = msgbuf; message = msgbuf;
} }
PyErr_SetString(PyExc_TypeError, message); PyErr_SetString(PyExc_TypeError, message);
...@@ -222,6 +224,7 @@ seterror(int iarg, char *msg, int *levels, char *fname, char *message) ...@@ -222,6 +224,7 @@ seterror(int iarg, char *msg, int *levels, char *fname, char *message)
if (PyErr_Occurred()) if (PyErr_Occurred())
return; return;
else if (message == NULL) { else if (message == NULL) {
/* XXX snprintf */
if (fname != NULL) { if (fname != NULL) {
sprintf(p, "%.200s() ", fname); sprintf(p, "%.200s() ", fname);
p += strlen(p); p += strlen(p);
...@@ -294,19 +297,20 @@ converttuple(PyObject *arg, char **p_format, va_list *p_va, int *levels, ...@@ -294,19 +297,20 @@ converttuple(PyObject *arg, char **p_format, va_list *p_va, int *levels,
if (!PySequence_Check(arg) || PyString_Check(arg)) { if (!PySequence_Check(arg) || PyString_Check(arg)) {
levels[0] = 0; levels[0] = 0;
sprintf(msgbuf, PyOS_snprintf(msgbuf, sizeof(msgbuf),
toplevel ? "expected %d arguments, not %.50s" : toplevel ? "expected %d arguments, not %.50s" :
"must be %d-item sequence, not %.50s", "must be %d-item sequence, not %.50s",
n, arg == Py_None ? "None" : arg->ob_type->tp_name); n,
arg == Py_None ? "None" : arg->ob_type->tp_name);
return msgbuf; return msgbuf;
} }
if ((i = PySequence_Size(arg)) != n) { if ((i = PySequence_Size(arg)) != n) {
levels[0] = 0; levels[0] = 0;
sprintf(msgbuf, PyOS_snprintf(msgbuf, sizeof(msgbuf),
toplevel ? "expected %d arguments, not %d" : toplevel ? "expected %d arguments, not %d" :
"must be sequence of length %d, not %d", "must be sequence of length %d, not %d",
n, i); n, i);
return msgbuf; return msgbuf;
} }
...@@ -366,7 +370,9 @@ converterr(char *expected, PyObject *arg, char *msgbuf) ...@@ -366,7 +370,9 @@ converterr(char *expected, PyObject *arg, char *msgbuf)
{ {
assert(expected != NULL); assert(expected != NULL);
assert(arg != NULL); assert(arg != NULL);
sprintf(msgbuf, "must be %.50s, not %.50s", expected, /* XXX use snprintf? */
sprintf(msgbuf,
"must be %.50s, not %.50s", expected,
arg == Py_None ? "None" : arg->ob_type->tp_name); arg == Py_None ? "None" : arg->ob_type->tp_name);
return msgbuf; return msgbuf;
} }
...@@ -1129,15 +1135,16 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format, ...@@ -1129,15 +1135,16 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
are not included in the "%d given" part of the message */ are not included in the "%d given" part of the message */
if (len < min || max < len) { if (len < min || max < len) {
if (message == NULL) { if (message == NULL) {
sprintf(msgbuf, PyOS_snprintf(msgbuf, sizeof(msgbuf),
"%.200s%s takes %s %d argument%s (%d given)", "%.200s%s takes %s %d argument%s "
fname==NULL ? "function" : fname, "(%d given)",
fname==NULL ? "" : "()", fname==NULL ? "function" : fname,
min==max ? "exactly" fname==NULL ? "" : "()",
: len < min ? "at least" : "at most", min==max ? "exactly"
len < min ? min : max, : len < min ? "at least" : "at most",
(len < min ? min : max) == 1 ? "" : "s", len < min ? min : max,
len); (len < min ? min : max) == 1 ? "" : "s",
len);
message = msgbuf; message = msgbuf;
} }
PyErr_SetString(PyExc_TypeError, message); PyErr_SetString(PyExc_TypeError, message);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7