summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/src/cmd/svr4pkg/pkgadm/lock.c2
-rw-r--r--usr/src/cmd/svr4pkg/pkginstall/main.c3
-rw-r--r--usr/src/cmd/svr4pkg/pkgremove/main.c8
3 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/cmd/svr4pkg/pkgadm/lock.c b/usr/src/cmd/svr4pkg/pkgadm/lock.c
index 8e27c576aa..964049678b 100644
--- a/usr/src/cmd/svr4pkg/pkgadm/lock.c
+++ b/usr/src/cmd/svr4pkg/pkgadm/lock.c
@@ -394,7 +394,7 @@ admin_lock(int argc, char **argv)
case ':':
log_msg(LOG_MSG_ERR, MSG_MISSING_OPERAND, optopt);
- /* LINTED fallthrough on case statement */
+ /* FALLTHROUGH */
case '?':
default:
diff --git a/usr/src/cmd/svr4pkg/pkginstall/main.c b/usr/src/cmd/svr4pkg/pkginstall/main.c
index 297b05b6ca..666d7e3a32 100644
--- a/usr/src/cmd/svr4pkg/pkginstall/main.c
+++ b/usr/src/cmd/svr4pkg/pkginstall/main.c
@@ -97,7 +97,8 @@ static int merg_respfile(void);
static int mv_pkgdirs(void);
static int rdonly(char *p);
static void ck_w_dryrun(int (*func)(), int type);
-static void copyright(void), usage(void);
+static void copyright(void);
+static void usage(void) __NORETURN;
static void do_pkgask(boolean_t a_run_request_as_root);
static void rm_icas(char *casdir);
static void set_dryrun_dir_loc(void);
diff --git a/usr/src/cmd/svr4pkg/pkgremove/main.c b/usr/src/cmd/svr4pkg/pkgremove/main.c
index 8209b52158..cfff491e47 100644
--- a/usr/src/cmd/svr4pkg/pkgremove/main.c
+++ b/usr/src/cmd/svr4pkg/pkgremove/main.c
@@ -1307,22 +1307,22 @@ ckreturn(int retcode, char *msg)
case 12:
case 22:
warnflag++;
- /*FALLTHRU*/
if (msg)
progerr(msg);
+ /* FALLTHROUGH */
case 10:
case 20:
if (retcode >= 10)
dreboot++;
if (retcode >= 20)
ireboot++;
- /*FALLTHRU*/
+ /* FALLTHROUGH */
case 0:
break; /* okay */
case -1:
retcode = 99;
- /*FALLTHRU*/
+ /* FALLTHROUGH */
case 99:
case 1:
case 11:
@@ -1335,7 +1335,7 @@ ckreturn(int retcode, char *msg)
case 25:
if (msg)
progerr(msg);
- /*FALLTHRU*/
+ /* FALLTHROUGH */
case 3:
case 13:
case 23: