summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2017-07-16 01:15:17 +0300
committerHans Rosenfeld <hans.rosenfeld@joyent.com>2018-04-23 18:15:40 +0200
commitc0882bf482806dc6459d8b317ff54b69d1602bf0 (patch)
treef59c7af73b3ddc48359df4bb5193bbddd79a8d48
parent2ae4c13b79c29604a25f0cedb59f2acff223bd26 (diff)
downloadillumos-joyent-c0882bf482806dc6459d8b317ff54b69d1602bf0.tar.gz
9402 restore: this statement may fall through
Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk> Reviewed by: C Fraire <cfraire@me.com> Approved by: Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
-rw-r--r--usr/src/cmd/backup/restore/dirs.c2
-rw-r--r--usr/src/cmd/backup/restore/interactive.c2
-rw-r--r--usr/src/cmd/backup/restore/main.c2
-rw-r--r--usr/src/cmd/backup/restore/restore.c6
-rw-r--r--usr/src/cmd/backup/restore/restore.h4
-rw-r--r--usr/src/cmd/backup/restore/symtab.c2
-rw-r--r--usr/src/cmd/backup/restore/utilities.c2
7 files changed, 3 insertions, 17 deletions
diff --git a/usr/src/cmd/backup/restore/dirs.c b/usr/src/cmd/backup/restore/dirs.c
index 63d96dd770..774dbf6add 100644
--- a/usr/src/cmd/backup/restore/dirs.c
+++ b/usr/src/cmd/backup/restore/dirs.c
@@ -12,8 +12,6 @@
* specifies the terms and conditions for redistribution.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include "restore.h"
#include <byteorder.h>
#include <stdlib.h>
diff --git a/usr/src/cmd/backup/restore/interactive.c b/usr/src/cmd/backup/restore/interactive.c
index 04a7a8a323..3d2c2c7bb0 100644
--- a/usr/src/cmd/backup/restore/interactive.c
+++ b/usr/src/cmd/backup/restore/interactive.c
@@ -12,8 +12,6 @@
* specifies the terms and conditions for redistribution.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <setjmp.h>
#include <euc.h>
#include <widec.h>
diff --git a/usr/src/cmd/backup/restore/main.c b/usr/src/cmd/backup/restore/main.c
index 6d91edfb12..655fe66dce 100644
--- a/usr/src/cmd/backup/restore/main.c
+++ b/usr/src/cmd/backup/restore/main.c
@@ -12,8 +12,6 @@
* specifies the terms and conditions for redistribution.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* Modified to recursively extract all files within a subtree
* (supressed by the h option) and recreate the heirarchical
diff --git a/usr/src/cmd/backup/restore/restore.c b/usr/src/cmd/backup/restore/restore.c
index 2a0b67dfd4..f10603e549 100644
--- a/usr/src/cmd/backup/restore/restore.c
+++ b/usr/src/cmd/backup/restore/restore.c
@@ -12,8 +12,6 @@
* specifies the terms and conditions for redistribution.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include "restore.h"
/* undef MAXNAMLEN to prevent compiler warnings about redef in dirent.h */
#undef MAXNAMLEN
@@ -487,7 +485,7 @@ nodeupdates(name, ino, type)
(void) fprintf(stderr, "[%s] %s: %s\n",
keyval(key), name, gettext("inconsistent state"));
done(1);
- /*NOTREACHED*/
+ /* NOTREACHED */
/*
* These states "cannot" arise for any state of the symbol table.
@@ -498,7 +496,7 @@ nodeupdates(name, ino, type)
(void) fprintf(stderr, "[%s] %s: %s\n",
keyval(key), name, gettext("impossible state"));
done(1);
- /*NOTREACHED*/
+ /* NOTREACHED */
}
return (descend);
}
diff --git a/usr/src/cmd/backup/restore/restore.h b/usr/src/cmd/backup/restore/restore.h
index 347eb25b35..3bd76044c4 100644
--- a/usr/src/cmd/backup/restore/restore.h
+++ b/usr/src/cmd/backup/restore/restore.h
@@ -15,8 +15,6 @@
#ifndef _RESTORE_H
#define _RESTORE_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <stdio.h>
#include <string.h>
#include <malloc.h>
@@ -250,7 +248,7 @@ extern struct direct *rst_readdir(RST_DIR *);
extern void setdirmodes(void);
extern int genliteraldir(char *, ino_t);
extern int inodetype(ino_t);
-extern void done(int);
+extern void done(int) __NORETURN;
extern void runcmdshell(void);
extern void canon(char *, char *, size_t);
extern void onintr(int);
diff --git a/usr/src/cmd/backup/restore/symtab.c b/usr/src/cmd/backup/restore/symtab.c
index e98df9e567..5bffc3d5c4 100644
--- a/usr/src/cmd/backup/restore/symtab.c
+++ b/usr/src/cmd/backup/restore/symtab.c
@@ -12,8 +12,6 @@
* All rights reserved.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* These routines maintain the symbol table which tracks the state
* of the file system being restored. They provide lookup by either
diff --git a/usr/src/cmd/backup/restore/utilities.c b/usr/src/cmd/backup/restore/utilities.c
index 2bd4f757b1..7cfa8b1ec4 100644
--- a/usr/src/cmd/backup/restore/utilities.c
+++ b/usr/src/cmd/backup/restore/utilities.c
@@ -12,8 +12,6 @@
* specifies the terms and conditions for redistribution.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include "restore.h"
#include <ctype.h>
#include <errno.h>