summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/fs.d/hsfs/labelit/labelit.c2
-rw-r--r--usr/src/cmd/fs.d/udfs/fsck/setup.c4
-rw-r--r--usr/src/cmd/fs.d/ufs/fsck/setup.c5
-rw-r--r--usr/src/cmd/fs.d/ufs/fsdb/fsdb.c8
-rw-r--r--usr/src/cmd/fs.d/ufs/fssnap/fssnap.c20
5 files changed, 15 insertions, 24 deletions
diff --git a/usr/src/cmd/fs.d/hsfs/labelit/labelit.c b/usr/src/cmd/fs.d/hsfs/labelit/labelit.c
index 51f1507e64..1eaaa0ef48 100644
--- a/usr/src/cmd/fs.d/hsfs/labelit/labelit.c
+++ b/usr/src/cmd/fs.d/hsfs/labelit/labelit.c
@@ -145,7 +145,7 @@ main(int argc, char **argv)
if (argc > 1)
fprintf(stderr, "%s: Illegal option %s in input\n",
callname, string);
- usage();
+ usage();
}
/* open image file in read write only if necessary */
diff --git a/usr/src/cmd/fs.d/udfs/fsck/setup.c b/usr/src/cmd/fs.d/udfs/fsck/setup.c
index c66d2545b3..802ecee3d5 100644
--- a/usr/src/cmd/fs.d/udfs/fsck/setup.c
+++ b/usr/src/cmd/fs.d/udfs/fsck/setup.c
@@ -25,8 +25,6 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#define DKTYPENAMES
#include <stdio.h>
#include <stdlib.h>
@@ -210,7 +208,7 @@ restat:
fswritefd = -1;
if (preen && !debug)
pfatal(gettext("(NO WRITE ACCESS)\n"));
- (void) printf(gettext(" (NO WRITE)"));
+ (void) printf(gettext(" (NO WRITE)"));
}
if (preen == 0)
(void) printf("\n");
diff --git a/usr/src/cmd/fs.d/ufs/fsck/setup.c b/usr/src/cmd/fs.d/ufs/fsck/setup.c
index 7e6feedfd4..e95eae6aa0 100644
--- a/usr/src/cmd/fs.d/ufs/fsck/setup.c
+++ b/usr/src/cmd/fs.d/ufs/fsck/setup.c
@@ -25,8 +25,6 @@
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#define DKTYPENAMES
#include <stdio.h>
#include <stdlib.h>
@@ -611,11 +609,12 @@ find_superblock(caddr_t devstr)
calcsb_names[style]) == 1 &&
calcsb(style, devstr, fsreadfd, &sblock)) {
break;
+ }
}
/*
* We got something from mkfs/newfs, so use it.
*/
- if (style < MAX_SB_STYLES)
+ if (style < MAX_SB_STYLES) {
proto.fs_ncg = sblock.fs_ncg;
bflag = 0;
}
diff --git a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c
index 1059fc9e59..bdabf28435 100644
--- a/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c
+++ b/usr/src/cmd/fs.d/ufs/fsdb/fsdb.c
@@ -31,10 +31,6 @@ char copyright[] =
All rights reserved.\n";
#endif /* not lint */
-#ifndef lint
-static char sccsid[] = "@(#)fsdb.c 5.8 (Berkeley) 6/1/90";
-#endif /* not lint */
-
/*
* fsdb - file system debugger
*
@@ -2566,8 +2562,8 @@ follow_path(long level, long inum)
top = NULL;
else
top--;
- nfiles--;
- goto duplicate;
+ nfiles--;
+ goto duplicate;
}
}
}
diff --git a/usr/src/cmd/fs.d/ufs/fssnap/fssnap.c b/usr/src/cmd/fs.d/ufs/fssnap/fssnap.c
index 4ac621e61b..58c6b7ec15 100644
--- a/usr/src/cmd/fs.d/ufs/fssnap/fssnap.c
+++ b/usr/src/cmd/fs.d/ufs/fssnap/fssnap.c
@@ -23,8 +23,6 @@
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -106,16 +104,16 @@ main(int argc, char *argv[])
char *value;
int longjmp_return;
- char *mountpoint = NULL;
- int mountfd = -1;
- char *backpath = NULL;
+ char *volatile mountpoint = NULL;
+ int volatile mountfd = -1;
+ char *volatile backpath = NULL;
- int delete = 0;
- int stats = 0;
- u_offset_t maxsize = 0;
- uint_t chunksize = 0;
- int rawfile = 0;
- int dounlink = 0;
+ int volatile delete = 0;
+ int volatile stats = 0;
+ u_offset_t volatile maxsize = 0;
+ uint_t volatile chunksize = 0;
+ int volatile rawfile = 0;
+ int volatile dounlink = 0;
if ((progname = strrchr(argv[0], '/')) != NULL)
++progname;