X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhstore.c;h=cb411d8cb186752cc264281dd69db7d5a6fc05d8;hb=6cdade9983a7ebd5a5bb8296daa49d5475f07af8;hp=377e8dc7b72ce45478e981f83a8ca748b6f844fc;hpb=7ffcbc3d01bb58a071d56f5e7379948c579f634a;p=mmh

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 377e8dc..cb411d8 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -28,29 +28,21 @@ static struct swit switches[] = {
 	{ "check", 0 },
 #define NCHECKSW  3
 	{ "nocheck", 0 },
-#define VERBSW  4
-	{ "verbose", 0 },
-#define NVERBSW  5
-	{ "noverbose", 0 },
-#define FILESW  6  /* interface from show */
+#define FILESW  4  /* interface from show */
 	{ "file file", 0 },
-#define PARTSW  7
+#define PARTSW  5
 	{ "part number", 0 },
-#define TYPESW  8
+#define TYPESW  6
 	{ "type content", 0 },
-#define RCACHESW  9
+#define RCACHESW  7
 	{ "rcache policy", 0 },
-#define WCACHESW  10
+#define WCACHESW  8
 	{ "wcache policy", 0 },
-#define VERSIONSW  11
+#define VERSIONSW  9
 	{ "version", 0 },
-#define HELPSW  12
+#define HELPSW  10
 	{ "help", 0 },
-
-/*
-** switches for debugging
-*/
-#define DEBUGSW  13
+#define DEBUGSW  11
 	{ "debug", -5 },
 	{ NULL, 0 }
 };
@@ -73,7 +65,6 @@ extern char *types[NTYPES + 1];
 extern int userrs;
 
 int debugsw = 0;
-int verbosw = 0;
 
 #define quitser pipeser
 
@@ -94,7 +85,7 @@ void freects_done(int) NORETURN;
 /*
 ** static prototypes
 */
-static RETSIGTYPE pipeser(int);
+static void pipeser(int);
 
 int autosw = 0;
 
@@ -249,12 +240,6 @@ do_cache:
 				file = *cp == '-' ? cp : getcpy(expanddir(cp));
 				continue;
 
-			case VERBSW:
-				verbosw = 1;
-				continue;
-			case NVERBSW:
-				verbosw = 0;
-				continue;
 			case DEBUGSW:
 				debugsw = 1;
 				continue;
@@ -423,7 +408,7 @@ do_cache:
 }
 
 
-static RETSIGTYPE
+static void
 pipeser(int i)
 {
 	if (i == SIGQUIT) {
@@ -453,7 +438,7 @@ store_all_messages(CT *cts)
 	*/
 	if (autosw)
 		dir = getcpy(cwd);
-	else if ((cp = context_find(nmhstorage)) && *cp)
+	if ((cp = context_find(nmhstorage)) && *cp)
 		dir = getcpy(cp);
 	else
 		dir = getcpy(cwd);