placate gcc-8.0.1 warnings

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-04-06 18:26:33 +02:00
parent f5018dac21
commit 2ab994f707
2 changed files with 5 additions and 3 deletions

View File

@ -464,11 +464,9 @@ static const char conv_str[] ALIGN1 =
"\v" "\\""v""\0"
;
static void conv_c(PR *pr, unsigned char *p)
{
const char *str = conv_str;
char buf[10];
do {
if (*p == *str) {
@ -482,7 +480,9 @@ static void conv_c(PR *pr, unsigned char *p)
*pr->cchar = 'c';
printf(pr->fmt, *p);
} else {
sprintf(buf, "%03o", (int) *p);
char buf[4];
/* gcc-8.0.1 needs lots of casts to shut up */
sprintf(buf, "%03o", (unsigned)(uint8_t)*p);
str = buf;
strpr:
*pr->cchar = 's';

View File

@ -222,6 +222,7 @@ struct globals {
#define str_equal(s,t) (strcmp((s), (t)) == 0)
#if ENABLE_SV || ENABLE_SVC
static void fatal_cannot(const char *m1) NORETURN;
static void fatal_cannot(const char *m1)
{
@ -688,6 +689,7 @@ static int sv(char **argv)
}
return rc > 99 ? 99 : rc;
}
#endif
#if ENABLE_SV
int sv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;