mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 03:05:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Remove 'const' from local variable declaration in string_zfill() -- it

Browse source 
isn't constant, so why bother.

Folded long lines.

Whitespace normalization.
This commit is contained in:
Guido van Rossum 2002-04-15 13:48:52 +00:00
parent 068325ef92
commit 3aa3fc46c8
1 changed files with 79 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

149
Objects/stringobject.c
View file

@ -1,4 +1,3 @@
/* String object implementation */ /* String object implementation */
#include "Python.h" #include "Python.h"
@ -17,29 +16,30 @@ static PyStringObject *characters[UCHAR_MAX + 1];
static PyStringObject *nullstring; static PyStringObject *nullstring;
/* /*
For both PyString_FromString() and PyString_FromStringAndSize(), the For both PyString_FromString() and PyString_FromStringAndSize(), the
parameter `size' denotes number of characters to allocate, not counting any parameter `size' denotes number of characters to allocate, not counting any
null terminating character. null terminating character.
For PyString_FromString(), the parameter `str' points to a null-terminated For PyString_FromString(), the parameter `str' points to a null-terminated
string containing exactly `size' bytes. string containing exactly `size' bytes.
For PyString_FromStringAndSize(), the parameter the parameter `str' is For PyString_FromStringAndSize(), the parameter the parameter `str' is
either NULL or else points to a string containing at least `size' bytes. For either NULL or else points to a string containing at least `size' bytes.
PyString_FromStringAndSize(), the string in the `str' parameter does not For PyString_FromStringAndSize(), the string in the `str' parameter does
have to be null-terminated. (Therefore it is safe to construct a substring not have to be null-terminated. (Therefore it is safe to construct a
by calling `PyString_FromStringAndSize(origstring, substrlen)'.) If `str' substring by calling `PyString_FromStringAndSize(origstring, substrlen)'.)
is NULL then PyString_FromStringAndSize() will allocate `size+1' bytes If `str' is NULL then PyString_FromStringAndSize() will allocate `size+1'
(setting the last byte to the null terminating character) and you can fill in bytes (setting the last byte to the null terminating character) and you can
the data yourself. If `str' is non-NULL then the resulting PyString object fill in the data yourself. If `str' is non-NULL then the resulting
must be treated as immutable and you must not fill in nor alter the data PyString object must be treated as immutable and you must not fill in nor
yourself, since the strings may be shared. alter the data yourself, since the strings may be shared.
The PyObject member `op->ob_size', which denotes the number of "extra items" The PyObject member `op->ob_size', which denotes the number of "extra
in a variable-size object, will contain the number of bytes allocated for items" in a variable-size object, will contain the number of bytes
string data, not counting the null terminating character. It is therefore allocated for string data, not counting the null terminating character. It
equal to the equal to the `size' parameter (for PyString_FromStringAndSize()) is therefore equal to the equal to the `size' parameter (for
or the length of the string in the `str' parameter (for PyString_FromString()). PyString_FromStringAndSize()) or the length of the string in the `str'
parameter (for PyString_FromString()).
*/ */
PyObject * PyObject *
PyString_FromStringAndSize(const char *str, int size) PyString_FromStringAndSize(const char *str, int size)
@ -171,7 +171,7 @@ PyString_FromFormatV(const char *format, va_list vargs)
added */ added */
if (*f == 'l' && *(f+1) == 'd') if (*f == 'l' && *(f+1) == 'd')
++f; ++f;
switch (*f) { switch (*f) {
case 'c': case 'c':
(void)va_arg(count, int); (void)va_arg(count, int);
@ -205,7 +205,7 @@ PyString_FromFormatV(const char *format, va_list vargs)
the format string to the output the format string to the output
string. (we cannot just skip the string. (we cannot just skip the
code, since there's no way to know code, since there's no way to know
what's in the argument list) */ what's in the argument list) */
n += strlen(p); n += strlen(p);
goto expand; goto expand;
} }
@ -219,7 +219,7 @@ PyString_FromFormatV(const char *format, va_list vargs)
string = PyString_FromStringAndSize(NULL, n); string = PyString_FromStringAndSize(NULL, n);
if (!string) if (!string)
return NULL; return NULL;
s = PyString_AsString(string); s = PyString_AsString(string);
for (f = format; *f; f++) { for (f = format; *f; f++) {
@ -245,7 +245,7 @@ PyString_FromFormatV(const char *format, va_list vargs)
longflag = 1; longflag = 1;
++f; ++f;
} }
switch (*f) { switch (*f) {
case 'c': case 'c':
*s++ = va_arg(vargs, int); *s++ = va_arg(vargs, int);
@ -296,14 +296,14 @@ PyString_FromFormatV(const char *format, va_list vargs)
} else } else
*s++ = *f; *s++ = *f;
} }
end: end:
_PyString_Resize(&string, s - PyString_AS_STRING(string)); _PyString_Resize(&string, s - PyString_AS_STRING(string));
return string; return string;
} }
PyObject * PyObject *
PyString_FromFormat(const char *format, ...) PyString_FromFormat(const char *format, ...)
{ {
PyObject* ret; PyObject* ret;
va_list vargs; va_list vargs;
@ -538,7 +538,7 @@ PyString_AsStringAndSize(register PyObject *obj,
if (obj == NULL) if (obj == NULL)
return -1; return -1;
} }
else else
#endif #endif
{ {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
@ -586,7 +586,8 @@ string_print(PyStringObject *op, FILE *fp, int flags)
/* figure out which quote to use; single is preferred */ /* figure out which quote to use; single is preferred */
quote = '\''; quote = '\'';
if (memchr(op->ob_sval, '\'', op->ob_size) && !memchr(op->ob_sval, '"', op->ob_size)) if (memchr(op->ob_sval, '\'', op->ob_size) &&
!memchr(op->ob_sval, '"', op->ob_size))
quote = '"'; quote = '"';
fputc(quote, fp); fputc(quote, fp);
@ -630,7 +631,8 @@ string_repr(register PyStringObject *op)
/* figure out which quote to use; single is preferred */ /* figure out which quote to use; single is preferred */
quote = '\''; quote = '\'';
if (memchr(op->ob_sval, '\'', op->ob_size) && !memchr(op->ob_sval, '"', op->ob_size)) if (memchr(op->ob_sval, '\'', op->ob_size) &&
!memchr(op->ob_sval, '"', op->ob_size))
quote = '"'; quote = '"';
p = PyString_AS_STRING(v); p = PyString_AS_STRING(v);
@ -868,7 +870,7 @@ string_richcompare(PyStringObject *a, PyStringObject *b, int op)
much time, since Py_NE is rarely used. */ much time, since Py_NE is rarely used. */
if (a->ob_size == b->ob_size if (a->ob_size == b->ob_size
&& (a->ob_sval[0] == b->ob_sval[0] && (a->ob_sval[0] == b->ob_sval[0]
&& memcmp(a->ob_sval, b->ob_sval, && memcmp(a->ob_sval, b->ob_sval,
a->ob_size) == 0)) { a->ob_size) == 0)) {
result = Py_True; result = Py_True;
} else { } else {
@ -2392,7 +2394,7 @@ string_zfill(PyStringObject *self, PyObject *args)
{ {
int fill; int fill;
PyObject *s; PyObject *s;
const char *p; char *p;
int width; int width;
if (!PyArg_ParseTuple(args, "i:zfill", &width)) if (!PyArg_ParseTuple(args, "i:zfill", &width))
@ -2738,10 +2740,10 @@ static PyMethodDef
string_methods[] = { string_methods[] = {
/* Counterparts of the obsolete stropmodule functions; except /* Counterparts of the obsolete stropmodule functions; except
string.maketrans(). */ string.maketrans(). */
{"join", (PyCFunction)string_join, METH_O, join__doc__}, {"join", (PyCFunction)string_join, METH_O, join__doc__},
{"split", (PyCFunction)string_split, METH_VARARGS, split__doc__}, {"split", (PyCFunction)string_split, METH_VARARGS, split__doc__},
{"lower", (PyCFunction)string_lower, METH_NOARGS, lower__doc__}, {"lower", (PyCFunction)string_lower, METH_NOARGS, lower__doc__},
{"upper", (PyCFunction)string_upper, METH_NOARGS, upper__doc__}, {"upper", (PyCFunction)string_upper, METH_NOARGS, upper__doc__},
{"islower", (PyCFunction)string_islower, METH_NOARGS, islower__doc__}, {"islower", (PyCFunction)string_islower, METH_NOARGS, islower__doc__},
{"isupper", (PyCFunction)string_isupper, METH_NOARGS, isupper__doc__}, {"isupper", (PyCFunction)string_isupper, METH_NOARGS, isupper__doc__},
{"isspace", (PyCFunction)string_isspace, METH_NOARGS, isspace__doc__}, {"isspace", (PyCFunction)string_isspace, METH_NOARGS, isspace__doc__},
@ -2749,32 +2751,36 @@ string_methods[] = {
{"istitle", (PyCFunction)string_istitle, METH_NOARGS, istitle__doc__}, {"istitle", (PyCFunction)string_istitle, METH_NOARGS, istitle__doc__},
{"isalpha", (PyCFunction)string_isalpha, METH_NOARGS, isalpha__doc__}, {"isalpha", (PyCFunction)string_isalpha, METH_NOARGS, isalpha__doc__},
{"isalnum", (PyCFunction)string_isalnum, METH_NOARGS, isalnum__doc__}, {"isalnum", (PyCFunction)string_isalnum, METH_NOARGS, isalnum__doc__},
{"capitalize", (PyCFunction)string_capitalize, METH_NOARGS, capitalize__doc__}, {"capitalize", (PyCFunction)string_capitalize, METH_NOARGS,
{"count", (PyCFunction)string_count, METH_VARARGS, count__doc__}, capitalize__doc__},
{"endswith", (PyCFunction)string_endswith, METH_VARARGS, endswith__doc__}, {"count", (PyCFunction)string_count, METH_VARARGS, count__doc__},
{"find", (PyCFunction)string_find, METH_VARARGS, find__doc__}, {"endswith", (PyCFunction)string_endswith, METH_VARARGS,
{"index", (PyCFunction)string_index, METH_VARARGS, index__doc__}, endswith__doc__},
{"lstrip", (PyCFunction)string_lstrip, METH_VARARGS, lstrip__doc__}, {"find", (PyCFunction)string_find, METH_VARARGS, find__doc__},
{"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__}, {"index", (PyCFunction)string_index, METH_VARARGS, index__doc__},
{"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__}, {"lstrip", (PyCFunction)string_lstrip, METH_VARARGS, lstrip__doc__},
{"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__}, {"replace", (PyCFunction)string_replace, METH_VARARGS, replace__doc__},
{"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__}, {"rfind", (PyCFunction)string_rfind, METH_VARARGS, rfind__doc__},
{"startswith", (PyCFunction)string_startswith, METH_VARARGS, startswith__doc__}, {"rindex", (PyCFunction)string_rindex, METH_VARARGS, rindex__doc__},
{"strip", (PyCFunction)string_strip, METH_VARARGS, strip__doc__}, {"rstrip", (PyCFunction)string_rstrip, METH_VARARGS, rstrip__doc__},
{"swapcase", (PyCFunction)string_swapcase, METH_NOARGS, swapcase__doc__}, {"startswith", (PyCFunction)string_startswith, METH_VARARGS,
{"translate", (PyCFunction)string_translate, METH_VARARGS, translate__doc__}, startswith__doc__},
{"title", (PyCFunction)string_title, METH_NOARGS, title__doc__}, {"strip", (PyCFunction)string_strip, METH_VARARGS, strip__doc__},
{"ljust", (PyCFunction)string_ljust, METH_VARARGS, ljust__doc__}, {"swapcase", (PyCFunction)string_swapcase, METH_NOARGS,
{"rjust", (PyCFunction)string_rjust, METH_VARARGS, rjust__doc__}, swapcase__doc__},
{"center", (PyCFunction)string_center, METH_VARARGS, center__doc__}, {"translate", (PyCFunction)string_translate, METH_VARARGS,
{"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__}, translate__doc__},
{"encode", (PyCFunction)string_encode, METH_VARARGS, encode__doc__}, {"title", (PyCFunction)string_title, METH_NOARGS, title__doc__},
{"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__}, {"ljust", (PyCFunction)string_ljust, METH_VARARGS, ljust__doc__},
{"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS, expandtabs__doc__}, {"rjust", (PyCFunction)string_rjust, METH_VARARGS, rjust__doc__},
{"splitlines", (PyCFunction)string_splitlines, METH_VARARGS, splitlines__doc__}, {"center", (PyCFunction)string_center, METH_VARARGS, center__doc__},
#if 0 {"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__},
{"zfill", (PyCFunction)string_zfill, METH_VARARGS, zfill__doc__}, {"encode", (PyCFunction)string_encode, METH_VARARGS, encode__doc__},
#endif {"decode", (PyCFunction)string_decode, METH_VARARGS, decode__doc__},
{"expandtabs", (PyCFunction)string_expandtabs, METH_VARARGS,
expandtabs__doc__},
{"splitlines", (PyCFunction)string_splitlines, METH_VARARGS,
splitlines__doc__},
{NULL, NULL} /* sentinel */ {NULL, NULL} /* sentinel */
}; };
@ -3154,7 +3160,7 @@ formatint(char *buf, size_t buflen, int flags,
if ((flags & F_ALT) && if ((flags & F_ALT) &&
(type == 'x' || type == 'X')) { (type == 'x' || type == 'X')) {
/* When converting under %#x or %#X, there are a number /* When converting under %#x or %#X, there are a number
* of issues that cause pain: * of issues that cause pain:
* - when 0 is being converted, the C standard leaves off * - when 0 is being converted, the C standard leaves off
* the '0x' or '0X', which is inconsistent with other * the '0x' or '0X', which is inconsistent with other
@ -3164,9 +3170,9 @@ formatint(char *buf, size_t buflen, int flags,
* convert 0 with the '0x' or '0X' * convert 0 with the '0x' or '0X'
* (Metrowerks, Compaq Tru64) * (Metrowerks, Compaq Tru64)
* - there are platforms that give '0x' when converting * - there are platforms that give '0x' when converting
* under %#X, but convert 0 in accordance with the * under %#X, but convert 0 in accordance with the
* standard (OS/2 EMX) * standard (OS/2 EMX)
* *
* We can achieve the desired consistency by inserting our * We can achieve the desired consistency by inserting our
* own '0x' or '0X' prefix, and substituting %x/%X in place * own '0x' or '0X' prefix, and substituting %x/%X in place
* of %#x/%#X. * of %#x/%#X.
@ -3174,12 +3180,12 @@ formatint(char *buf, size_t buflen, int flags,
* Note that this is the same approach as used in * Note that this is the same approach as used in
* formatint() in unicodeobject.c * formatint() in unicodeobject.c
*/ */
PyOS_snprintf(fmt, sizeof(fmt), "0%c%%.%dl%c", PyOS_snprintf(fmt, sizeof(fmt), "0%c%%.%dl%c",
type, prec, type); type, prec, type);
} }
else { else {
PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%dl%c", PyOS_snprintf(fmt, sizeof(fmt), "%%%s.%dl%c",
(flags&F_ALT) ? "#" : "", (flags&F_ALT) ? "#" : "",
prec, type); prec, type);
} }
@ -3188,7 +3194,7 @@ formatint(char *buf, size_t buflen, int flags,
*/ */
if (buflen <= 13 || buflen <= (size_t)2 + (size_t)prec) { if (buflen <= 13 || buflen <= (size_t)2 + (size_t)prec) {
PyErr_SetString(PyExc_OverflowError, PyErr_SetString(PyExc_OverflowError,
"formatted integer is too long (precision too large?)"); "formatted integer is too long (precision too large?)");
return -1; return -1;
} }
PyOS_snprintf(buf, buflen, fmt, x); PyOS_snprintf(buf, buflen, fmt, x);
@ -3280,7 +3286,8 @@ PyString_Format(PyObject *format, PyObject *args)
char *pbuf; char *pbuf;
int sign; int sign;
int len; int len;
char formatbuf[FORMATBUFLEN]; /* For format{float,int,char}() */ char formatbuf[FORMATBUFLEN];
/* For format{float,int,char}() */
#ifdef Py_USING_UNICODE #ifdef Py_USING_UNICODE
char *fmt_start = fmt; char *fmt_start = fmt;
int argidx_start = argidx; int argidx_start = argidx;
@ -3478,7 +3485,8 @@ PyString_Format(PyObject *format, PyObject *args)
} }
else { else {
pbuf = formatbuf; pbuf = formatbuf;
len = formatint(pbuf, sizeof(formatbuf), len = formatint(pbuf,
sizeof(formatbuf),
flags, prec, c, v); flags, prec, c, v);
if (len < 0) if (len < 0)
goto error; goto error;
@ -3494,7 +3502,8 @@ PyString_Format(PyObject *format, PyObject *args)
case 'g': case 'g':
case 'G': case 'G':
pbuf = formatbuf; pbuf = formatbuf;
len = formatfloat(pbuf, sizeof(formatbuf), flags, prec, c, v); len = formatfloat(pbuf, sizeof(formatbuf),
flags, prec, c, v);
if (len < 0) if (len < 0)
goto error; goto error;
sign = 1; sign = 1;