From f45bbb216955f393ea71539b44815a06ed8fc19e Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 17 Jul 2017 23:59:21 +0300 Subject: [PATCH] 9313 cmd/fs.d: this statement may fall through Reviewed by: Andy Fiddaman Reviewed by: Andrew Stormont Reviewed by: C Fraire Approved by: Gordon Ross --- usr/src/cmd/fs.d/autofs/autod_nfs.c | 1 + usr/src/cmd/fs.d/ff.c | 3 +-- usr/src/cmd/fs.d/hsfs/labelit/labelit.c | 1 + usr/src/cmd/fs.d/smbclnt/smbutil/smbutil.c | 3 +-- usr/src/cmd/fs.d/udfs/fsck/pass1.c | 3 +-- usr/src/cmd/fs.d/ufs/fsdb/fsdb.c | 8 +------- usr/src/cmd/fs.d/ufs/mkfs/mkfs.c | 6 +++--- usr/src/cmd/fs.d/ufs/newfs/newfs.c | 2 +- 8 files changed, 10 insertions(+), 17 deletions(-) diff --git a/usr/src/cmd/fs.d/autofs/autod_nfs.c b/usr/src/cmd/fs.d/autofs/autod_nfs.c index fb6ab8643c..76cdcc77e2 100644 --- a/usr/src/cmd/fs.d/autofs/autod_nfs.c +++ b/usr/src/cmd/fs.d/autofs/autod_nfs.c @@ -4259,6 +4259,7 @@ get_netconfig_info(enum type_of_stuff type_of_stuff, char *hostname, break; case SERVER_PING: ping_server = 1; + /* FALLTHROUGH */ case SERVER_ADDR: nb = get_server_addrorping(hostname, prog, vers, nconf, port, tinfo, tbind, fhp, direct_to_server, diff --git a/usr/src/cmd/fs.d/ff.c b/usr/src/cmd/fs.d/ff.c index df6fcb8ba8..e11b072371 100644 --- a/usr/src/cmd/fs.d/ff.c +++ b/usr/src/cmd/fs.d/ff.c @@ -28,9 +28,8 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include +#include #include #include #include diff --git a/usr/src/cmd/fs.d/hsfs/labelit/labelit.c b/usr/src/cmd/fs.d/hsfs/labelit/labelit.c index 1eaaa0ef48..78e089c9f6 100644 --- a/usr/src/cmd/fs.d/hsfs/labelit/labelit.c +++ b/usr/src/cmd/fs.d/hsfs/labelit/labelit.c @@ -334,6 +334,7 @@ updatelabel(void) * after update unix volume descriptor, * fall thru to update the iso primary vol descriptor */ + /* FALLTHROUGH */ case 1: copystring(sysid, (char *)ISO_sys_id(iso_buf), 32); copystring(volid, (char *)ISO_vol_id(iso_buf), 32); diff --git a/usr/src/cmd/fs.d/smbclnt/smbutil/smbutil.c b/usr/src/cmd/fs.d/smbclnt/smbutil/smbutil.c index 404b436d16..20cb3a2c86 100644 --- a/usr/src/cmd/fs.d/smbclnt/smbutil/smbutil.c +++ b/usr/src/cmd/fs.d/smbclnt/smbutil/smbutil.c @@ -54,8 +54,7 @@ #define EX_DATAERR 1 #endif -static void help(void); - +static void help(void) __NORETURN; typedef int cmd_fn_t (int argc, char *argv[]); typedef void cmd_usage_t (void); diff --git a/usr/src/cmd/fs.d/udfs/fsck/pass1.c b/usr/src/cmd/fs.d/udfs/fsck/pass1.c index 3d18f53958..fad597b719 100644 --- a/usr/src/cmd/fs.d/udfs/fsck/pass1.c +++ b/usr/src/cmd/fs.d/udfs/fsck/pass1.c @@ -25,8 +25,6 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -168,6 +166,7 @@ pass1() case FTYPE_FILE: case FTYPE_SYMLINK: ckinode(fp); + /* FALLTHROUGH */ default: n_files++; break; diff --git a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c index bdabf28435..17ea9f99f2 100644 --- a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c +++ b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c @@ -25,12 +25,6 @@ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -char copyright[] = -"@(#) Copyright(c) 1988 Regents of the University of California.\n\ -All rights reserved.\n"; -#endif /* not lint */ - /* * fsdb - file system debugger * @@ -323,7 +317,7 @@ static void print(long value, int fieldsz, int digits, int lead); static void printsb(struct fs *); static void printcg(struct cg *); static void pbits(unsigned char *, int); -static void old_fsdb(int, char *); /* For old fsdb functionality */ +static void old_fsdb(int, char *) __NORETURN; /* For old fsdb functionality */ static int isnumber(char *); static int icheck(u_offset_t); diff --git a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c index a3464f9b5c..7cf5e1c5a0 100644 --- a/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c +++ b/usr/src/cmd/fs.d/ufs/mkfs/mkfs.c @@ -403,7 +403,7 @@ static void wtfs_breakup(diskaddr_t bno, int size, char *bf); static int isblock(struct fs *fs, unsigned char *cp, int h); static void clrblock(struct fs *fs, unsigned char *cp, int h); static void setblock(struct fs *fs, unsigned char *cp, int h); -static void usage(); +static void usage(void) __NORETURN; static void dump_fscmd(char *fsys, int fsi); static uint64_t number(uint64_t d_value, char *param, int flags); static int match(char *s); @@ -572,7 +572,7 @@ diskaddr_t testfrags; int inlockexit; int isbad; -void lockexit(int); +void lockexit(int) __NORETURN; void randomgeneration(void); void checksummarysize(void); int checksblock(struct fs, int); @@ -3452,7 +3452,7 @@ setblock(struct fs *fs, unsigned char *cp, int h) } static void -usage() +usage(void) { (void) fprintf(stderr, gettext("ufs usage: mkfs [-F FSType] [-V] [-m] [-o options] " diff --git a/usr/src/cmd/fs.d/ufs/newfs/newfs.c b/usr/src/cmd/fs.d/ufs/newfs/newfs.c index 8c2f198aef..877c31a30d 100644 --- a/usr/src/cmd/fs.d/ufs/newfs/newfs.c +++ b/usr/src/cmd/fs.d/ufs/newfs/newfs.c @@ -64,7 +64,7 @@ static int validate_size(char *disk, diskaddr_t size); static void exenv(void); static struct fs *read_sb(char *); /*PRINTFLIKE1*/ -static void fatal(char *fmt, ...); +static void fatal(char *fmt, ...) __NORETURN; #define EPATH "PATH=/usr/sbin:/sbin:" #define CPATH "/sbin" /* an EPATH element */ -- 2.11.4.GIT