This diff does 3 things, which I don't think are complicated, hence I will put
them together.
1. remove quitit since it is not required. We exit without using it.
2. swap the position of qQ and xX. Its tidier in my mind.
3. Change the fall-thru comments to FALLTHROUGH.
any or all ok?
-mark
P.S. I can resend individually if required.
Index: msgs.c
===================================================================
RCS file: /cvs/src/usr.bin/msgs/msgs.c,v
retrieving revision 1.35
diff -u -p -r1.35 msgs.c
--- msgs.c 22 Sep 2010 11:10:52 -0000 1.35
+++ msgs.c 22 Sep 2010 11:18:28 -0000
@@ -111,7 +111,6 @@ bool seensubj;
bool blankline;
bool printing = NO;
bool mailing = NO;
-bool quitit = NO;
bool sending = NO;
bool restricted = NO;
int uid;
@@ -535,16 +534,14 @@ main(int argc, char *argv[])
cmnd:
in = inbuf;
switch (*in) {
- case 'x':
- case 'X':
- exit(0);
-
case 'q':
case 'Q':
- quitit = YES;
printf("--Postponed--\n");
+ /*FALLTHROUGH*/
+ case 'x':
+ case 'X':
exit(0);
- /* intentional fall-thru */
+
case 'n':
case 'N':
if (msg >= nextmsg)
@@ -555,7 +552,7 @@ cmnd:
case 'p':
case 'P':
use_pager = (*in++ == 'p');
- /* intentional fallthru */
+ /*FALLTHROUGH*/
case '\n':
case 'y':
default:
@@ -584,8 +581,6 @@ cmnd:
}
if (newmsg)
fclose(newmsg);
- if (quitit)
- break;
}
/*
@@ -597,7 +592,7 @@ cmnd:
fprintf(msgsrc, "%d\n", nextmsg);
fflush(msgsrc);
}
- if (already && !quitit && lastcmd && totty) {
+ if (already && lastcmd && totty) {
/*
* save or reply to last message?
*/
