Standardize on "east const" (type const * not const type *)

Avoid "WARNING: Move const after static - use 'static const char'"
This commit is contained in:
Rangi
2021-11-17 23:01:58 -05:00
committed by Eldred Habert
parent efccf6c931
commit 3e945679ad
17 changed files with 64 additions and 59 deletions

16
src/extern/err.c vendored
View File

@@ -14,7 +14,7 @@
#include "extern/err.h"
void rgbds_vwarn(const char *fmt, va_list ap)
void rgbds_vwarn(char const *fmt, va_list ap)
{
fprintf(stderr, "warning: ");
if (fmt) {
@@ -24,7 +24,7 @@ void rgbds_vwarn(const char *fmt, va_list ap)
perror(NULL);
}
void rgbds_vwarnx(const char *fmt, va_list ap)
void rgbds_vwarnx(char const *fmt, va_list ap)
{
fprintf(stderr, "warning");
if (fmt) {
@@ -34,7 +34,7 @@ void rgbds_vwarnx(const char *fmt, va_list ap)
putc('\n', stderr);
}
_Noreturn void rgbds_verr(int status, const char *fmt, va_list ap)
_Noreturn void rgbds_verr(int status, char const *fmt, va_list ap)
{
fprintf(stderr, "error: ");
if (fmt) {
@@ -46,7 +46,7 @@ _Noreturn void rgbds_verr(int status, const char *fmt, va_list ap)
exit(status);
}
_Noreturn void rgbds_verrx(int status, const char *fmt, va_list ap)
_Noreturn void rgbds_verrx(int status, char const *fmt, va_list ap)
{
fprintf(stderr, "error");
if (fmt) {
@@ -57,7 +57,7 @@ _Noreturn void rgbds_verrx(int status, const char *fmt, va_list ap)
exit(status);
}
void rgbds_warn(const char *fmt, ...)
void rgbds_warn(char const *fmt, ...)
{
va_list ap;
@@ -66,7 +66,7 @@ void rgbds_warn(const char *fmt, ...)
va_end(ap);
}
void rgbds_warnx(const char *fmt, ...)
void rgbds_warnx(char const *fmt, ...)
{
va_list ap;
@@ -75,7 +75,7 @@ void rgbds_warnx(const char *fmt, ...)
va_end(ap);
}
_Noreturn void rgbds_err(int status, const char *fmt, ...)
_Noreturn void rgbds_err(int status, char const *fmt, ...)
{
va_list ap;
@@ -84,7 +84,7 @@ _Noreturn void rgbds_err(int status, const char *fmt, ...)
va_end(ap);
}
_Noreturn void rgbds_errx(int status, const char *fmt, ...)
_Noreturn void rgbds_errx(int status, char const *fmt, ...)
{
va_list ap;

18
src/extern/getopt.c vendored
View File

@@ -37,7 +37,7 @@ int musl_optind = 1, musl_opterr = 1, musl_optopt;
int musl_optreset = 0;
static int musl_optpos;
static void musl_getopt_msg(const char *a, const char *b, const char *c, size_t l)
static void musl_getopt_msg(char const *a, char const *b, char const *c, size_t l)
{
FILE *f = stderr;
@@ -47,7 +47,7 @@ static void musl_getopt_msg(const char *a, const char *b, const char *c, size_t
putc('\n', f);
}
static int getopt(int argc, char *argv[], const char *optstring)
static int getopt(int argc, char *argv[], char const *optstring)
{
int i;
wchar_t c, d;
@@ -140,9 +140,11 @@ static void permute(char **argv, int dest, int src)
argv[dest] = tmp;
}
static int musl_getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly);
static int musl_getopt_long_core(int argc, char **argv, char const *optstring,
const struct option *longopts, int *idx, int longonly);
static int musl_getopt_long(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
static int musl_getopt_long(int argc, char **argv, char const *optstring,
const struct option *longopts, int *idx, int longonly)
{
int ret, skipped, resumed;
@@ -178,7 +180,8 @@ static int musl_getopt_long(int argc, char **argv, const char *optstring, const
return ret;
}
static int musl_getopt_long_core(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx, int longonly)
static int musl_getopt_long_core(int argc, char **argv, char const *optstring,
const struct option *longopts, int *idx, int longonly)
{
musl_optarg = 0;
if (longopts && argv[musl_optind][0] == '-' &&
@@ -189,7 +192,7 @@ static int musl_getopt_long_core(int argc, char **argv, const char *optstring, c
char *arg = 0, *opt, *start = argv[musl_optind] + 1;
for (cnt = i = 0; longopts[i].name; i++) {
const char *name = longopts[i].name;
char const *name = longopts[i].name;
opt = start;
if (*opt == '-')
@@ -277,7 +280,8 @@ static int musl_getopt_long_core(int argc, char **argv, const char *optstring, c
return getopt(argc, argv, optstring);
}
int musl_getopt_long_only(int argc, char **argv, const char *optstring, const struct option *longopts, int *idx)
int musl_getopt_long_only(int argc, char **argv, char const *optstring,
const struct option *longopts, int *idx)
{
return musl_getopt_long(argc, argv, optstring, longopts, idx, 1);
}