diff options
Diffstat (limited to 'src/z-form.c')
| -rw-r--r-- | src/z-form.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/z-form.c b/src/z-form.c index cffa1d4b..ec68f74f 100644 --- a/src/z-form.c +++ b/src/z-form.c @@ -92,7 +92,7 @@ * Append the character "c". * Do not use the "+" or "0" flags. * - * Format("%s", cptr s) + * Format("%s", const char *s) * Append the string "s". * Do not use the "+" or "0" flags. * Note that a "NULL" value of "s" is converted to the empty string. @@ -177,9 +177,9 @@ * the given buffer to a length of zero, and return a "length" of zero. * The contents of "buf", except for "buf[0]", may then be undefined. */ -unsigned int vstrnfmt(char *buf, unsigned int max, cptr fmt, va_list vp) +unsigned int vstrnfmt(char *buf, unsigned int max, const char *fmt, va_list vp) { - cptr s; + const char *s; /* The argument is "long" */ bool_ do_long; @@ -499,10 +499,10 @@ unsigned int vstrnfmt(char *buf, unsigned int max, cptr fmt, va_list vp) /* String */ case 's': { - cptr arg; + const char *arg; /* Access next argument */ - arg = va_arg(vp, cptr); + arg = va_arg(vp, const char *); /* Hack -- convert NULL to EMPTY */ if (!arg) arg = ""; @@ -556,7 +556,7 @@ unsigned int vstrnfmt(char *buf, unsigned int max, cptr fmt, va_list vp) * Do a vstrnfmt (see above) into a (growable) static buffer. * This buffer is usable for very short term formatting of results. */ -static char *vformat(cptr fmt, va_list vp) +static char *vformat(const char *fmt, va_list vp) { static char *format_buf = NULL; static size_t format_len = 0; @@ -605,7 +605,7 @@ static char *vformat(cptr fmt, va_list vp) /* * Do a vstrnfmt (see above) into a buffer of a given size. */ -unsigned int strnfmt(char *buf, unsigned int max, cptr fmt, ...) +unsigned int strnfmt(char *buf, unsigned int max, const char *fmt, ...) { unsigned int len; @@ -633,7 +633,7 @@ unsigned int strnfmt(char *buf, unsigned int max, cptr fmt, ...) * Note that the buffer is (technically) writable, but only up to * the length of the string contained inside it. */ -char *format(cptr fmt, ...) +char *format(const char *fmt, ...) { char *res; va_list vp; @@ -657,7 +657,7 @@ char *format(cptr fmt, ...) /* * Vararg interface to quit() */ -void quit_fmt(cptr fmt, ...) +void quit_fmt(const char *fmt, ...) { char *res; va_list vp; |