From fec46055b92c6c6721fc6698843744a264e6ca70 Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Sun, 16 Jul 2017 12:10:02 +0300 Subject: 9376 sendmail: this statement may fall through Reviewed by: Andy Fiddaman Reviewed by: Hans Rosenfeld Approved by: Robert Mustacchi --- usr/src/cmd/sendmail/aux/editmap.c | 4 +--- usr/src/cmd/sendmail/aux/mail.local.c | 4 ++-- usr/src/cmd/sendmail/aux/mailstats.c | 3 +-- usr/src/cmd/sendmail/aux/makemap.c | 5 +---- usr/src/cmd/sendmail/aux/praliases.c | 1 + usr/src/cmd/sendmail/db/hash/hash_func.c | 21 ++++++++++++++------- usr/src/cmd/sendmail/src/alias.c | 3 +-- usr/src/cmd/sendmail/src/domain.c | 4 +--- usr/src/cmd/sendmail/src/queue.c | 1 + 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/usr/src/cmd/sendmail/aux/editmap.c b/usr/src/cmd/sendmail/aux/editmap.c index 46d9fd10ba..a86a24d456 100644 --- a/usr/src/cmd/sendmail/aux/editmap.c +++ b/usr/src/cmd/sendmail/aux/editmap.c @@ -11,8 +11,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #ifndef lint SM_UNUSED(static char copyright[]) = @@ -263,7 +261,7 @@ main(argc, argv) # endif /* UID_MAX */ break; } - + /* FALLTHROUGH */ default: continue; diff --git a/usr/src/cmd/sendmail/aux/mail.local.c b/usr/src/cmd/sendmail/aux/mail.local.c index 98f4fb6636..0d04d3c58c 100644 --- a/usr/src/cmd/sendmail/aux/mail.local.c +++ b/usr/src/cmd/sendmail/aux/mail.local.c @@ -19,7 +19,7 @@ static char copyright[] = The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ -#pragma ident "%Z%%M% %I% %E% SMI" +#pragma ident "%Z%%M% %I% %E% SMI" #ifndef lint static char sccsid[] = "@(#)mail.local.c 8.83 (Berkeley) 12/17/98"; @@ -1145,9 +1145,9 @@ e_to_sys(num) eval = EX_UNAVAILABLE; break; } - /* FALLTHROUGH */ #endif /* EDQUOT */ #ifdef EAGAIN + /* FALLTHROUGH */ case EAGAIN: /* Resource temporarily unavailable */ #endif #ifdef EBUSY diff --git a/usr/src/cmd/sendmail/aux/mailstats.c b/usr/src/cmd/sendmail/aux/mailstats.c index f7870aa7de..6c5f9a18f8 100644 --- a/usr/src/cmd/sendmail/aux/mailstats.c +++ b/usr/src/cmd/sendmail/aux/mailstats.c @@ -12,8 +12,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include SM_IDSTR(copyright, @@ -182,6 +180,7 @@ main(argc, argv) } if (sfile == NULL) sfile = sfilebuf; + /* FALLTHROUGH */ default: continue; diff --git a/usr/src/cmd/sendmail/aux/makemap.c b/usr/src/cmd/sendmail/aux/makemap.c index d887386ffc..3b4ab68ba5 100644 --- a/usr/src/cmd/sendmail/aux/makemap.c +++ b/usr/src/cmd/sendmail/aux/makemap.c @@ -11,8 +11,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include SM_IDSTR(copyright, @@ -24,7 +22,6 @@ SM_IDSTR(copyright, SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.179 2008/04/14 02:06:16 ca Exp $") - #include #ifndef ISC_UNIX # include @@ -290,7 +287,7 @@ main(argc, argv) # endif /* UID_MAX */ break; } - + /* FALLTHROUGH */ default: continue; diff --git a/usr/src/cmd/sendmail/aux/praliases.c b/usr/src/cmd/sendmail/aux/praliases.c index d0ee54e37a..8839334286 100644 --- a/usr/src/cmd/sendmail/aux/praliases.c +++ b/usr/src/cmd/sendmail/aux/praliases.c @@ -217,6 +217,7 @@ main(argc, argv) } praliases(b, argc, argv); } + /* FALLTHROUGH */ default: continue; diff --git a/usr/src/cmd/sendmail/db/hash/hash_func.c b/usr/src/cmd/sendmail/db/hash/hash_func.c index 4809a8098e..6819a54184 100644 --- a/usr/src/cmd/sendmail/db/hash/hash_func.c +++ b/usr/src/cmd/sendmail/db/hash/hash_func.c @@ -50,13 +50,6 @@ #include "config.h" -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifndef lint -static const char sccsid[] = "@(#)hash_func.c 10.7 (Sleepycat) 9/16/97"; -static const char sccsi2[] = "%W% (Sun) %G%"; -#endif /* not lint */ - #ifndef NO_SYSTEM_INCLUDES #include #endif @@ -124,18 +117,25 @@ __ham_func3(key, len) case 0: do { HASHC; + /* FALLTHROUGH */ case 7: HASHC; + /* FALLTHROUGH */ case 6: HASHC; + /* FALLTHROUGH */ case 5: HASHC; + /* FALLTHROUGH */ case 4: HASHC; + /* FALLTHROUGH */ case 3: HASHC; + /* FALLTHROUGH */ case 2: HASHC; + /* FALLTHROUGH */ case 1: HASHC; } while (--loop); @@ -173,18 +173,25 @@ __ham_func4(key, len) case 0: do { HASH4; + /* FALLTHROUGH */ case 7: HASH4; + /* FALLTHROUGH */ case 6: HASH4; + /* FALLTHROUGH */ case 5: HASH4; + /* FALLTHROUGH */ case 4: HASH4; + /* FALLTHROUGH */ case 3: HASH4; + /* FALLTHROUGH */ case 2: HASH4; + /* FALLTHROUGH */ case 1: HASH4; } while (--loop); diff --git a/usr/src/cmd/sendmail/src/alias.c b/usr/src/cmd/sendmail/src/alias.c index d8a6562b8e..c94a47767a 100644 --- a/usr/src/cmd/sendmail/src/alias.c +++ b/usr/src/cmd/sendmail/src/alias.c @@ -11,8 +11,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include SM_RCSID("@(#)$Id: alias.c,v 8.219 2006/10/24 18:04:09 ca Exp $") @@ -990,6 +988,7 @@ forward(user, sendq, aliaslevel, e) break; #endif /* _FFR_FORWARD_SYSERR */ + /* FALLTHROUGH */ default: if (LogLevel > (RunAsUid == 0 ? 2 : 10)) sm_syslog(LOG_WARNING, e->e_id, diff --git a/usr/src/cmd/sendmail/src/domain.c b/usr/src/cmd/sendmail/src/domain.c index 3b3a6d3971..4c5b23819c 100644 --- a/usr/src/cmd/sendmail/src/domain.c +++ b/usr/src/cmd/sendmail/src/domain.c @@ -11,8 +11,6 @@ * */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include "map.h" @@ -1043,9 +1041,9 @@ nexttype: ** Such MX matches are as good as an A match, ** fall through. */ - /* FALLTHROUGH */ # if NETINET6 + /* FALLTHROUGH */ case T_AAAA: # endif /* NETINET6 */ case T_A: diff --git a/usr/src/cmd/sendmail/src/queue.c b/usr/src/cmd/sendmail/src/queue.c index 194f5250d6..9bafb02194 100644 --- a/usr/src/cmd/sendmail/src/queue.c +++ b/usr/src/cmd/sendmail/src/queue.c @@ -4468,6 +4468,7 @@ readqf(e, openonly) /* format: flag (1 char) space long-integer */ e->e_dlvr_flag = buf[1]; e->e_deliver_by = strtol(&buf[3], NULL, 10); + /* FALLTHROUGH */ case '$': /* define macro */ { -- cgit v1.2.3