summaryrefslogtreecommitdiff
path: root/usr
diff options
context:
space:
mode:
authorAlek Pinchuk <alek@nexenta.com>2012-04-06 18:41:42 -0500
committerRichard Lowe <richlowe@richlowe.net>2012-04-09 20:35:34 -0400
commit9dc42874cbf5b71e55522fc6ab014d911f8d174a (patch)
tree449b983af4eb21797128b6b3e2fbb6e9f1d03612 /usr
parent96e91bfe83dda4f97ad40f0001ee8afe94f6b005 (diff)
downloadillumos-joyent-9dc42874cbf5b71e55522fc6ab014d911f8d174a.tar.gz
865 old mcs swap debugging code should be removed
Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr')
-rw-r--r--usr/src/cmd/sgs/mcs/common/main.c24
1 files changed, 5 insertions, 19 deletions
diff --git a/usr/src/cmd/sgs/mcs/common/main.c b/usr/src/cmd/sgs/mcs/common/main.c
index 91dc2127ab..03410bf26c 100644
--- a/usr/src/cmd/sgs/mcs/common/main.c
+++ b/usr/src/cmd/sgs/mcs/common/main.c
@@ -20,6 +20,8 @@
*/
/*
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
+ *
* Copyright (c) 1988 AT&T
* All Rights Reserved
*
@@ -43,7 +45,6 @@ static size_t optbufsz = OPTUNIT;
static void usage(int);
static void sigexit(int);
static int setup_sectname(char *, int);
-static void check_swap();
static void queue(int, char *);
int
@@ -51,7 +52,7 @@ main(int argc, char ** argv, char ** envp)
{
const char *opt;
char *str;
- int error_count = 0, num_sect = 0, errflag = 0, Dflag = 0;
+ int error_count = 0, num_sect = 0, errflag = 0;
int c, i, my_prog;
Cmd_Info *cmd_info;
@@ -72,10 +73,10 @@ main(int argc, char ** argv, char ** envp)
if (strcmp(str, "mcs") == 0) {
my_prog = MCS;
- opt = "Da:cdn:pVz?";
+ opt = "a:cdn:pVz?";
} else if (strcmp(str, "strip") == 0) {
my_prog = STRIP;
- opt = "DlxV?";
+ opt = "lxV?";
} else
exit(FAILURE);
@@ -108,10 +109,6 @@ main(int argc, char ** argv, char ** envp)
while ((c = getopt(argc, argv, (char *)opt)) != EOF) {
switch (c) {
- case 'D':
- optcnt++;
- Dflag++;
- break;
case 'a':
optcnt++;
queue(ACT_APPEND, optarg);
@@ -169,9 +166,6 @@ main(int argc, char ** argv, char ** envp)
exit(FAILURE);
}
- if (Dflag)
- check_swap();
-
/*
* strip command may not take any options.
*/
@@ -235,8 +229,6 @@ main(int argc, char ** argv, char ** envp)
}
}
- if (Dflag)
- check_swap();
mcs_exit(error_count);
/*NOTREACHED*/
return (0);
@@ -372,9 +364,3 @@ sectcmp(char *name)
}
return (1);
}
-
-static void
-check_swap()
-{
- (void) system("/usr/sbin/swap -s");
-}