mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
Fix many GCC -Wimplicit-fallthrough
warnings (#243)
This commit adds '/* FALLTHROUGH */' comments to fix many GCC warnings when compiling with -Wimplicit-fallthrough. Additionally, the existing fallthrough comments have been changed for consistency.
This commit is contained in:
parent
f30da49564
commit
ed478ab7e3
73 changed files with 271 additions and 158 deletions
|
@ -44,7 +44,7 @@ asolock(unsigned int volatile* lock, unsigned int key, int type)
|
|||
case ASO_LOCK:
|
||||
if (*lock == key)
|
||||
return 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case ASO_SPINLOCK:
|
||||
for (k = 0; asocasint(lock, 0, key) != 0; ASOLOOP(k));
|
||||
return 0;
|
||||
|
|
|
@ -115,7 +115,7 @@ gobble(Match_t* mp, register char* s, register int sub, int* g, int clear)
|
|||
case '\\':
|
||||
if (mbgetchar(s))
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 0:
|
||||
return 0;
|
||||
case '[':
|
||||
|
@ -295,7 +295,7 @@ onematch(Match_t* mp, int g, char* s, char* p, char* e, char* r, int flags)
|
|||
if (n <= g && mp->current.beg[n])
|
||||
pc = *mp->current.beg[n];
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (icase && isupper(pc))
|
||||
pc = tolower(pc);
|
||||
|
@ -321,7 +321,7 @@ onematch(Match_t* mp, int g, char* s, char* p, char* e, char* r, int flags)
|
|||
case 0:
|
||||
if (!(flags & STR_MAXIMAL))
|
||||
sc = 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '|':
|
||||
case '&':
|
||||
case ')':
|
||||
|
@ -502,7 +502,7 @@ onematch(Match_t* mp, int g, char* s, char* p, char* e, char* r, int flags)
|
|||
break;
|
||||
}
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (icase && isupper(pc))
|
||||
pc = tolower(pc);
|
||||
|
|
|
@ -56,7 +56,7 @@ getopt(int argc, char* const* argv, const char* optstring)
|
|||
{
|
||||
case ':':
|
||||
n = '?';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '?':
|
||||
if (opterr && (!optstring || *optstring != ':'))
|
||||
{
|
||||
|
|
|
@ -190,11 +190,11 @@ Sfdisc_t* dp;
|
|||
{
|
||||
case '\t':
|
||||
more->col = ((more->col + 8) & ~7) - 1;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (++more->col <= more->cols || s < e && *s == '\n')
|
||||
continue;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '\n':
|
||||
more->col = 1;
|
||||
if (++more->row < more->rows)
|
||||
|
|
|
@ -1013,7 +1013,7 @@ findwrite(register Find_t* fp, const char* path, size_t len, const char* type)
|
|||
else
|
||||
u = 0;
|
||||
sfputu(fp->fp, u);
|
||||
/*FALLTHROUGH...*/
|
||||
/* FALLTHROUGH */
|
||||
case FF_dir:
|
||||
d = n - fp->encode.prefix;
|
||||
sfputl(fp->fp, d);
|
||||
|
|
|
@ -856,7 +856,7 @@ fts_read(register FTS* fts)
|
|||
t = f;
|
||||
f = f->fts_link;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case 0:
|
||||
|
||||
|
@ -864,7 +864,7 @@ fts_read(register FTS* fts)
|
|||
order(fts);
|
||||
if (!(f = fts->todo))
|
||||
return 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_todo:
|
||||
|
||||
|
@ -914,7 +914,7 @@ fts_read(register FTS* fts)
|
|||
return 0;
|
||||
memcpy(fts->base, f->name, fts->baselen + 1);
|
||||
fts->name = fts->cd ? fts->path : fts->base;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_preorder:
|
||||
|
||||
|
@ -956,7 +956,7 @@ fts_read(register FTS* fts)
|
|||
fts->state = FTS_preorder_return;
|
||||
goto note;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_preorder_resume:
|
||||
|
||||
|
@ -997,7 +997,7 @@ fts_read(register FTS* fts)
|
|||
if (fts->endbase[-1] != '/')
|
||||
*fts->endbase++ = '/';
|
||||
fts->current = f;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_readdir:
|
||||
|
||||
|
@ -1147,7 +1147,7 @@ fts_read(register FTS* fts)
|
|||
fts->state = FTS_children_return;
|
||||
goto note;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_children_resume:
|
||||
|
||||
|
@ -1158,7 +1158,7 @@ fts_read(register FTS* fts)
|
|||
fts->todo = fts->top;
|
||||
fts->top = 0;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_popstack:
|
||||
|
||||
|
@ -1168,7 +1168,7 @@ fts_read(register FTS* fts)
|
|||
|
||||
fts->nd = 0;
|
||||
f = fts->current;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case FTS_popstack_resume:
|
||||
|
||||
|
|
|
@ -380,6 +380,7 @@ again:
|
|||
case '(':
|
||||
if (!(gp->gl_flags & GLOB_AUGMENTED))
|
||||
continue;
|
||||
/* FALLTHROUGH */
|
||||
case '*':
|
||||
case '?':
|
||||
meta = MATCH_META;
|
||||
|
|
|
@ -550,7 +550,7 @@ ckmagic(register Magic_t* mp, const char* file, char* buf, char* end, struct sta
|
|||
case '|':
|
||||
if (mp->keep[level] > 1)
|
||||
goto checknest;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (!mp->keep[level])
|
||||
{
|
||||
|
@ -678,7 +678,7 @@ ckmagic(register Magic_t* mp, const char* file, char* buf, char* end, struct sta
|
|||
case 'e':
|
||||
if (!(p = getdata(mp, num, 0)))
|
||||
goto next;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'E':
|
||||
if (!ep->value.sub)
|
||||
goto next;
|
||||
|
@ -714,7 +714,7 @@ ckmagic(register Magic_t* mp, const char* file, char* buf, char* end, struct sta
|
|||
case 'm':
|
||||
if (!(p = getdata(mp, num, 0)))
|
||||
goto next;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'M':
|
||||
case 'S':
|
||||
checkstr:
|
||||
|
@ -1356,7 +1356,7 @@ cklang(register Magic_t* mp, const char* file, char* buf, char* end, struct stat
|
|||
mp->mime = "application/x-cc";
|
||||
break;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'y':
|
||||
case 'Y':
|
||||
t1 = "yacc ";
|
||||
|
@ -1462,13 +1462,16 @@ cklang(register Magic_t* mp, const char* file, char* buf, char* end, struct stat
|
|||
case 4:
|
||||
if (b < e && (*b++ & 0xc0) != 0x80)
|
||||
break;
|
||||
/* FALLTHROUGH */
|
||||
case 3:
|
||||
if (b < e && (*b++ & 0xc0) != 0x80)
|
||||
break;
|
||||
/* FALLTHROUGH */
|
||||
case 2:
|
||||
if (b < e && (*b++ & 0xc0) != 0x80)
|
||||
break;
|
||||
n = 1;
|
||||
/* FALLTHROUGH */
|
||||
case 0:
|
||||
if (b >= e)
|
||||
{
|
||||
|
@ -1803,7 +1806,7 @@ load(register Magic_t* mp, char* file, register Sfio_t* fp)
|
|||
ep->nest = '1';
|
||||
}
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '+':
|
||||
case '&':
|
||||
case '|':
|
||||
|
@ -1812,7 +1815,7 @@ load(register Magic_t* mp, char* file, register Sfio_t* fp)
|
|||
default:
|
||||
if ((mp->flags & MAGIC_VERBOSE) && !isalpha(*p) && mp->disc->errorf)
|
||||
(*mp->disc->errorf)(mp, mp->disc, 1, "`%c': invalid line continuation operator", *p);
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '*':
|
||||
case '0': case '1': case '2': case '3': case '4':
|
||||
case '5': case '6': case '7': case '8': case '9':
|
||||
|
|
|
@ -2516,7 +2516,7 @@ opthelp(const char* oopts, const char* what)
|
|||
for (q = o; q < e; q++)
|
||||
if (!(q->flags & OPT_ignore) && !streq(q->catalog, o->catalog))
|
||||
o = q;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case STYLE_posix:
|
||||
sfputc(mp, '\f');
|
||||
break;
|
||||
|
|
|
@ -869,7 +869,7 @@ sfsync(sfstderr);
|
|||
proc->wfd = poi[1];
|
||||
close(poi[0]);
|
||||
#endif
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 1:
|
||||
proc->rfd = pio[0];
|
||||
close(pio[1]);
|
||||
|
|
|
@ -69,7 +69,7 @@ recstr(register const char* s, char** e)
|
|||
case 'f':
|
||||
case 'F':
|
||||
while (*++s == ' ' || *s == '\t' || *s == ',');
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '+':
|
||||
case '0': case '1': case '2': case '3': case '4':
|
||||
case '5': case '6': case '7': case '8': case '9':
|
||||
|
|
|
@ -87,7 +87,7 @@ pathcanon_20100601(char* path, size_t size, int flags)
|
|||
break;
|
||||
case 0:
|
||||
s--;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '/':
|
||||
while (*s == '/') s++;
|
||||
switch (dots)
|
||||
|
|
|
@ -753,7 +753,7 @@ astlicense(char* p, int size, char* file, char* options, int cc1, int cc2, int c
|
|||
break;
|
||||
case -1:
|
||||
c = SPECIAL;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
notice.type = c;
|
||||
notice.item[CLASS].data = lic[lic[c].quote].data;
|
||||
|
|
|
@ -89,7 +89,7 @@ astquery(int quit, const char* format, ...)
|
|||
{
|
||||
case EOF:
|
||||
n = c;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '\n':
|
||||
switch (n)
|
||||
{
|
||||
|
|
|
@ -171,7 +171,7 @@ mcfind(const char* locale, const char* catalog, int category, int nls, char* pat
|
|||
p += sizeof(lc_messages) - 1;
|
||||
goto case_C;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (s < e)
|
||||
*s++ = c;
|
||||
|
|
|
@ -775,7 +775,7 @@ magic(register Cenv_t* env, register int c, int escaped)
|
|||
env->token.len += ep - sp;
|
||||
return n;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case T_BACK+8:
|
||||
case T_BACK+9:
|
||||
if (env->type == SRE || c == T_BACK && !(env->flags & (REG_LENIENT|REG_REGEXP)))
|
||||
|
@ -2102,7 +2102,7 @@ grp(Cenv_t* env, int parno)
|
|||
env->error = REG_BADRPT;
|
||||
return 0;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 0:
|
||||
case T_CLOSE:
|
||||
x = 0;
|
||||
|
@ -2177,7 +2177,7 @@ grp(Cenv_t* env, int parno)
|
|||
case 'X':
|
||||
if (typ >= 0 || env->type == ERE && (env->flags & REG_CLASS_ESCAPE))
|
||||
break; /* PCRE_EXTRA */
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'A':
|
||||
env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_REGEXP|REG_SHELL|REG_LEFT|REG_RIGHT);
|
||||
env->flags |= REG_AUGMENTED|REG_EXTENDED;
|
||||
|
@ -2291,7 +2291,7 @@ grp(Cenv_t* env, int parno)
|
|||
return 0;
|
||||
case 'D':
|
||||
x = REX_NEST_delimiter;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
delimiter:
|
||||
if ((i = chr(env, &esc)) < 0)
|
||||
goto invalid;
|
||||
|
@ -2317,7 +2317,7 @@ grp(Cenv_t* env, int parno)
|
|||
continue;
|
||||
case 'Q':
|
||||
x = REX_NEST_quote;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
quote:
|
||||
if ((i = chr(env, &esc)) < 0)
|
||||
goto invalid;
|
||||
|
@ -2512,7 +2512,7 @@ grp(Cenv_t* env, int parno)
|
|||
env->paren[c]->re.group.back = 1;
|
||||
return rep(env, node(env, REX_BACK, c, 0, 0), 0, 0);
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
env->error = REG_BADRPT;
|
||||
return 0;
|
||||
|
@ -3182,7 +3182,7 @@ special(Cenv_t* env, regex_t* p)
|
|||
e = e->re.group.expr.rex;
|
||||
if (e->type != REX_DOT)
|
||||
return 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case REX_DOT:
|
||||
if (e->lo == 0 && e->hi == RE_DUP_INF)
|
||||
break;
|
||||
|
|
|
@ -770,7 +770,7 @@ nestmatch(register unsigned char* s, register unsigned char* e, const unsigned s
|
|||
if (!--n)
|
||||
return s;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case REX_NEST_open:
|
||||
if (c == co)
|
||||
{
|
||||
|
@ -1444,7 +1444,7 @@ DEBUG_TEST(0x0200,(sfprintf(sfstdout,"AHA#%04d 0x%04x parse %s=>%s `%-.*s'\n", _
|
|||
break;
|
||||
case GOOD:
|
||||
r = GOOD;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -66,12 +66,19 @@ Sflong_t v; /* the value to be written */
|
|||
{ switch(n)
|
||||
{
|
||||
case 8 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 7 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 6 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 5 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 4 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 3 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 2 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 1 : *ps++ = *s++;
|
||||
}
|
||||
f->next = ps;
|
||||
|
|
|
@ -62,12 +62,19 @@ Sfulong_t m; /* the max value of the range */
|
|||
{ switch(n)
|
||||
{
|
||||
case 8 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 7 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 6 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 5 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 4 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 3 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 2 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 1 : *ps++ = *s++;
|
||||
}
|
||||
f->next = ps;
|
||||
|
|
|
@ -59,12 +59,19 @@ Sfulong_t v; /* the unsigned value to be written */
|
|||
{ switch(n)
|
||||
{
|
||||
case 8 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 7 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 6 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 5 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 4 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 3 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 2 : *ps++ = *s++;
|
||||
/* FALLTHROUGH */
|
||||
case 1 : *ps++ = *s++;
|
||||
}
|
||||
f->next = ps;
|
||||
|
|
|
@ -1132,24 +1132,36 @@ typedef struct _sftab_
|
|||
#define MEMCPY(to,fr,n) \
|
||||
switch(n) \
|
||||
{ default : memcpy((Void_t*)to,(Void_t*)fr,n); to += n; fr += n; break; \
|
||||
case 7 : *to++ = *fr++; \
|
||||
case 6 : *to++ = *fr++; \
|
||||
case 5 : *to++ = *fr++; \
|
||||
case 4 : *to++ = *fr++; \
|
||||
case 3 : *to++ = *fr++; \
|
||||
case 2 : *to++ = *fr++; \
|
||||
case 1 : *to++ = *fr++; \
|
||||
case 7 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 6 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 5 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 4 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 3 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 2 : *to++ = *fr++; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 1 : *to++ = *fr++; \
|
||||
}
|
||||
#define MEMSET(s,c,n) \
|
||||
switch(n) \
|
||||
{ default : memset((Void_t*)s,(int)c,n); s += n; break; \
|
||||
case 7 : *s++ = c; \
|
||||
case 6 : *s++ = c; \
|
||||
case 5 : *s++ = c; \
|
||||
case 4 : *s++ = c; \
|
||||
case 3 : *s++ = c; \
|
||||
case 2 : *s++ = c; \
|
||||
case 1 : *s++ = c; \
|
||||
case 7 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 6 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 5 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 4 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 3 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 2 : *s++ = c; \
|
||||
/* FALLTHROUGH */ \
|
||||
case 1 : *s++ = c; \
|
||||
}
|
||||
|
||||
_BEGIN_EXTERNS_
|
||||
|
|
|
@ -537,7 +537,7 @@ reg int local; /* a local call */
|
|||
|
||||
break;
|
||||
}
|
||||
/* fall thru */
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case SF_READ: /* switching to SF_WRITE */
|
||||
if(wanted != SF_WRITE)
|
||||
|
|
|
@ -78,7 +78,7 @@ Sfio_t* f;
|
|||
|
||||
/* 2-way pipe, must clear read buffer */
|
||||
(void)_sfmode(f,SF_READ,1);
|
||||
/* fall through */
|
||||
/* FALLTHROUGH */
|
||||
case SF_READ:
|
||||
if(f->extent >= 0 && f->endb > f->next)
|
||||
{ f->here -= f->endb-f->next;
|
||||
|
|
|
@ -303,7 +303,7 @@ Sfdisc_t* disc;
|
|||
case SF_EDISC :
|
||||
if(!local && !(f->flags&SF_STRING))
|
||||
goto do_continue;
|
||||
/* else fall thru */
|
||||
/* FALLTHROUGH */
|
||||
case SF_ESTACK :
|
||||
SFMTXRETURN(f, -1);
|
||||
}
|
||||
|
|
|
@ -178,7 +178,8 @@ int type; /* >0: scanf, =0: printf, -1: internal */
|
|||
}
|
||||
else if(*form != '*')
|
||||
goto loop_flags;
|
||||
else form += 1; /* drop thru below */
|
||||
else form += 1;
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case '*' :
|
||||
form = sffmtint(form,&n);
|
||||
|
|
|
@ -367,8 +367,9 @@ loop_fmt :
|
|||
}
|
||||
else if(*form != '*')
|
||||
goto loop_flags;
|
||||
do_star:
|
||||
form += 1; /* fall thru for '*' */
|
||||
do_star: /* for '*' */
|
||||
form += 1;
|
||||
/* FALLTHROUGH */
|
||||
case '*' :
|
||||
form = (*_Sffmtintf)(form,&n);
|
||||
if(*form == '$')
|
||||
|
@ -674,6 +675,7 @@ loop_fmt :
|
|||
|
||||
case 'S':
|
||||
flags = (flags & ~(SFFMT_TYPES|SFFMT_LDOUBLE)) | SFFMT_LONG;
|
||||
/* FALLTHROUGH */
|
||||
case 's':
|
||||
#if _has_multibyte && defined(mbwidth)
|
||||
wc = (flags & SFFMT_LDOUBLE) && mbwide();
|
||||
|
@ -833,6 +835,7 @@ loop_fmt :
|
|||
|
||||
case 'C':
|
||||
flags = (flags & ~(SFFMT_TYPES|SFFMT_LDOUBLE)) | SFFMT_LONG;
|
||||
/* FALLTHROUGH */
|
||||
case 'c':
|
||||
#if _has_multibyte && defined(mbwidth)
|
||||
wc = (flags & SFFMT_LDOUBLE) && mbwide();
|
||||
|
@ -959,6 +962,7 @@ loop_fmt :
|
|||
goto int_arg;
|
||||
case 'X':
|
||||
ssp = "0123456789ABCDEF";
|
||||
/* FALLTHROUGH */
|
||||
case 'x':
|
||||
base = 16; n_s = 15; n = 4;
|
||||
flags &= ~(SFFMT_SIGN|SFFMT_BLANK);
|
||||
|
@ -974,6 +978,7 @@ loop_fmt :
|
|||
goto d_format;
|
||||
case 'u':
|
||||
flags &= ~(SFFMT_SIGN|SFFMT_BLANK);
|
||||
/* FALLTHROUGH */
|
||||
case 'd':
|
||||
d_format:
|
||||
#if _PACKAGE_ast
|
||||
|
|
|
@ -238,7 +238,7 @@ Sfdisc_t* disc;
|
|||
case SF_EDISC :
|
||||
if(!local && !(f->flags&SF_STRING))
|
||||
goto do_continue;
|
||||
/* else fall thru */
|
||||
/* FALLTHROUGH */
|
||||
case SF_ESTACK :
|
||||
SFMTXRETURN(f, (ssize_t)(-1));
|
||||
}
|
||||
|
|
|
@ -115,7 +115,7 @@ fmtip6(const unsigned char* addr, int bits)
|
|||
case 14:
|
||||
if (!a[14] && a[15] <= 15)
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 12:
|
||||
s = dec(s, "::", a[12]);
|
||||
s = dec(s, ".", a[13]);
|
||||
|
|
|
@ -266,7 +266,7 @@ fmtmatch(const char* as)
|
|||
case '$':
|
||||
if (e = !*s)
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
*t++ = c;
|
||||
continue;
|
||||
|
|
|
@ -129,7 +129,7 @@ fmtre(const char* as)
|
|||
end = 0;
|
||||
break;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '?':
|
||||
case '+':
|
||||
case '@':
|
||||
|
@ -210,7 +210,7 @@ fmtre(const char* as)
|
|||
logical:
|
||||
if (!*s || *s == ')')
|
||||
return 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
*t++ = c;
|
||||
continue;
|
||||
|
|
|
@ -105,7 +105,7 @@ strelapsed(register const char* s, char** e, int n)
|
|||
break;
|
||||
case '-':
|
||||
p = 1;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'd':
|
||||
v *= 24 * 60 * 60;
|
||||
break;
|
||||
|
|
|
@ -86,13 +86,13 @@ strperm(const char* aexpr, char** e, register int perm)
|
|||
c = '=';
|
||||
}
|
||||
expr--;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '=':
|
||||
if (who)
|
||||
perm &= ~who;
|
||||
else
|
||||
perm = 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '+':
|
||||
case '|':
|
||||
case '-':
|
||||
|
@ -112,7 +112,7 @@ strperm(const char* aexpr, char** e, register int perm)
|
|||
case 'X':
|
||||
if (!S_ISDIR(perm) && !(perm & (S_IXUSR|S_IXGRP|S_IXOTH)))
|
||||
continue;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'x':
|
||||
typ |= S_IXUSR|S_IXGRP|S_IXOTH;
|
||||
continue;
|
||||
|
@ -165,7 +165,7 @@ strperm(const char* aexpr, char** e, register int perm)
|
|||
perm &= ~who;
|
||||
else
|
||||
perm = 0;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '+':
|
||||
case '|':
|
||||
perm |= typ;
|
||||
|
@ -230,7 +230,7 @@ strperm(const char* aexpr, char** e, register int perm)
|
|||
}
|
||||
if (c)
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
if (c < '0' || c > '7')
|
||||
{
|
||||
|
|
|
@ -156,12 +156,12 @@ tokread(char* u)
|
|||
else if (!p->flg)
|
||||
p->flg = FLG_NEWLINE;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case ' ':
|
||||
case '\t':
|
||||
if (q)
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 0:
|
||||
if (s == --r)
|
||||
{
|
||||
|
|
|
@ -62,11 +62,15 @@ wc2utf8(register char* s, register uint32_t w)
|
|||
*s++ = ops[i].prefix | (w >> ops[i].shift);
|
||||
switch (ops[i].shift)
|
||||
{
|
||||
case 30: *s++ = 0x80 | ((w >> 24) & 0x3f);
|
||||
case 24: *s++ = 0x80 | ((w >> 18) & 0x3f);
|
||||
case 18: *s++ = 0x80 | ((w >> 12) & 0x3f);
|
||||
case 12: *s++ = 0x80 | ((w >> 6) & 0x3f);
|
||||
case 6: *s++ = 0x80 | (w & 0x3f);
|
||||
case 30: *s++ = 0x80 | ((w >> 24) & 0x3f);
|
||||
/* FALLTHROUGH */
|
||||
case 24: *s++ = 0x80 | ((w >> 18) & 0x3f);
|
||||
/* FALLTHROUGH */
|
||||
case 18: *s++ = 0x80 | ((w >> 12) & 0x3f);
|
||||
/* FALLTHROUGH */
|
||||
case 12: *s++ = 0x80 | ((w >> 6) & 0x3f);
|
||||
/* FALLTHROUGH */
|
||||
case 6: *s++ = 0x80 | (w & 0x3f);
|
||||
}
|
||||
return s - b;
|
||||
}
|
||||
|
|
|
@ -217,7 +217,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 2:
|
||||
c = 'd';
|
||||
break;
|
||||
|
@ -234,7 +234,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
c = 'I';
|
||||
break;
|
||||
|
@ -245,7 +245,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
c = 'H';
|
||||
break;
|
||||
|
@ -256,7 +256,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 2:
|
||||
c = 'm';
|
||||
break;
|
||||
|
@ -273,7 +273,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
c = 'M';
|
||||
break;
|
||||
|
@ -284,7 +284,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
c = 'S';
|
||||
break;
|
||||
|
@ -295,7 +295,7 @@ word2posix(register char* f, register char* w, int alternate)
|
|||
{
|
||||
case 1:
|
||||
p = '-';
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 2:
|
||||
c = 'y';
|
||||
break;
|
||||
|
|
|
@ -325,7 +325,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
case 'm':
|
||||
if (!m)
|
||||
m = 1;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'M':
|
||||
switch (*(s + 1))
|
||||
{
|
||||
|
@ -403,7 +403,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
case 'S':
|
||||
case 's':
|
||||
m = 2;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case ' ':
|
||||
case '_':
|
||||
case '\n':
|
||||
|
@ -1243,7 +1243,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
set |= state & (EXACT|LAST|NEXT|THIS);
|
||||
continue;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case TM_FINAL:
|
||||
state |= HOLD|THIS|FINAL;
|
||||
set &= ~(EXACT|LAST|NEXT|THIS);
|
||||
|
@ -1264,7 +1264,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
case TM_ORDINAL:
|
||||
j += TM_ORDINALS - TM_ORDINAL;
|
||||
message((-1, "AHA#%d j=%d", __LINE__, j));
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case TM_ORDINALS:
|
||||
n = j - TM_ORDINALS + 1;
|
||||
message((-1, "AHA#%d n=%d", __LINE__, n));
|
||||
|
@ -1300,7 +1300,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
continue;
|
||||
case TM_DAY_ABBREV:
|
||||
j += TM_DAY - TM_DAY_ABBREV;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case TM_DAY:
|
||||
case TM_PARTS:
|
||||
case TM_HOURS:
|
||||
|
@ -1330,7 +1330,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
set &= ~(EXACT|LAST|NEXT|THIS);
|
||||
set |= state & (EXACT|LAST|NEXT|THIS);
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case TM_DAYS:
|
||||
message((-1, "AHA#%d n=%d j=%d f=%d state=" FFMT, __LINE__, n, j, f, FLAGS(state)));
|
||||
if (n == -1)
|
||||
|
@ -1494,7 +1494,7 @@ tmxdate(register const char* s, char** e, Time_t now)
|
|||
continue;
|
||||
case TM_MONTH_ABBREV:
|
||||
j += TM_MONTH - TM_MONTH_ABBREV;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case TM_MONTH:
|
||||
if (state & MONTH)
|
||||
goto done;
|
||||
|
|
|
@ -177,7 +177,7 @@ tmxfmt(char* buf, size_t len, const char* format, Time_t t)
|
|||
pad = c;
|
||||
continue;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
|
@ -191,7 +191,7 @@ tmxfmt(char* buf, size_t len, const char* format, Time_t t)
|
|||
{
|
||||
case 0:
|
||||
parts++;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 1:
|
||||
width = width * 10 + (c - '0');
|
||||
break;
|
||||
|
|
|
@ -253,7 +253,7 @@ scan(register const char* s, char** e, const char* format, char** f, Time_t t, l
|
|||
case 'd':
|
||||
if (pedantic && !isdigit(*s))
|
||||
goto next;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'e':
|
||||
NUMBER(2, 1, 31);
|
||||
set.mday = n;
|
||||
|
@ -301,7 +301,7 @@ scan(register const char* s, char** e, const char* format, char** f, Time_t t, l
|
|||
s++;
|
||||
continue;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 't':
|
||||
while (isspace(*s))
|
||||
s++;
|
||||
|
@ -384,6 +384,7 @@ scan(register const char* s, char** e, const char* format, char** f, Time_t t, l
|
|||
u = 0;
|
||||
if (d == 'q')
|
||||
continue;
|
||||
/* FALLTHROUGH */
|
||||
case 'z':
|
||||
if ((zp = tmzone(s, &u, u, &m)))
|
||||
{
|
||||
|
|
|
@ -92,10 +92,10 @@ tmzone(register const char* name, char** end, const char* type, int* dst)
|
|||
{
|
||||
case 'C':
|
||||
d += 15;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'B':
|
||||
d += 15;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'A':
|
||||
d += 15;
|
||||
e++;
|
||||
|
|
|
@ -361,7 +361,7 @@ visit(State_t* state, register FTSENT* ent)
|
|||
error(2, "%s: cannot search directory", ent->fts_path);
|
||||
fts_set(NiL, ent, FTS_SKIP);
|
||||
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case FTS_D:
|
||||
if (state->directory)
|
||||
memcpy(state->path + state->postsiz, base, len);
|
||||
|
@ -520,7 +520,7 @@ visit(State_t* state, register FTSENT* ent)
|
|||
sfprintf(state->tmp, "%s.%s%d%s", state->path, state->suffix, v + 1, state->suffix);
|
||||
goto backup;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case BAK_simple:
|
||||
sfprintf(state->tmp, "%s%s", state->path, state->suffix);
|
||||
backup:
|
||||
|
@ -564,7 +564,7 @@ visit(State_t* state, register FTSENT* ent)
|
|||
else
|
||||
break;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case CP:
|
||||
if (S_ISLNK(ent->fts_statp->st_mode))
|
||||
{
|
||||
|
|
|
@ -165,7 +165,7 @@ cutinit(int mode, char* str, Delim_t* wdelim, Delim_t* ldelim, size_t reclen)
|
|||
case '\t':
|
||||
while(*cp==' ' || *cp=='\t')
|
||||
cp++;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 0:
|
||||
case ',':
|
||||
if(range)
|
||||
|
|
|
@ -87,7 +87,7 @@ b_head(int argc, register char** argv, Shbltin_t* context)
|
|||
{
|
||||
case 'c':
|
||||
delim = -1;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'n':
|
||||
if (opt_info.offset && argv[opt_info.index][opt_info.offset] == 'c')
|
||||
{
|
||||
|
|
|
@ -348,7 +348,7 @@ getrec(Join_t* jp, int index, int discard)
|
|||
cp = tp;
|
||||
break;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
goto next;
|
||||
}
|
||||
|
@ -866,7 +866,7 @@ b_join(int argc, char** argv, Shbltin_t* context)
|
|||
jp->file[0].field = (int)(opt_info.num-1);
|
||||
n = '2';
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case '1':
|
||||
case '2':
|
||||
if (opt_info.num <=0)
|
||||
|
@ -875,7 +875,7 @@ b_join(int argc, char** argv, Shbltin_t* context)
|
|||
continue;
|
||||
case 'v':
|
||||
jp->outmode &= ~C_COMMON;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'a':
|
||||
if (opt_info.num!=1 && opt_info.num!=2)
|
||||
error(2,"%s: file number must be 1 or 2", opt_info.name);
|
||||
|
|
|
@ -198,7 +198,7 @@ rm(State_t* state, register FTSENT* ent)
|
|||
}
|
||||
else if (ent->fts_info == FTS_D)
|
||||
break;
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case FTS_DP:
|
||||
if (isempty(ent) || state->directory)
|
||||
{
|
||||
|
@ -223,7 +223,7 @@ rm(State_t* state, register FTSENT* ent)
|
|||
fts_set(NiL, ent, FTS_AGAIN);
|
||||
break;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
default:
|
||||
nonempty(ent);
|
||||
if (!state->force)
|
||||
|
|
|
@ -936,7 +936,7 @@ b_stty(int argc, char** argv, Shbltin_t* context)
|
|||
}
|
||||
continue;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case ':':
|
||||
if (!opt_info.offset)
|
||||
error(2, "%s", opt_info.arg);
|
||||
|
|
|
@ -462,7 +462,7 @@ b_tail(int argc, char** argv, Shbltin_t* context)
|
|||
t = opt_info.arg;
|
||||
goto suffix;
|
||||
}
|
||||
/*FALLTHROUGH*/
|
||||
/* FALLTHROUGH */
|
||||
case 'n':
|
||||
flags |= COUNT;
|
||||
if (s = opt_info.arg)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue