emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

placate gcc-8.0.1 warnings

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libbb/dump.c
View File

@ -464,11 +464,9 @@ static const char conv_str[] ALIGN1 =
"\v" "\\""v""\0" "\v" "\\""v""\0"
; ;
static void conv_c(PR *pr, unsigned char *p) static void conv_c(PR *pr, unsigned char *p)
{ {
const char *str = conv_str; const char *str = conv_str;
char buf[10];
do { do {
if (*p == *str) { if (*p == *str) {
@ -482,7 +480,9 @@ static void conv_c(PR *pr, unsigned char *p)
*pr->cchar = 'c'; *pr->cchar = 'c';
printf(pr->fmt, *p); printf(pr->fmt, *p);
} else { } 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; str = buf;
strpr: strpr:
*pr->cchar = 's'; *pr->cchar = 's';

2
runit/sv.c
View File

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