From 534b88e7596a77f59556c33b7ad1b09d878e2ee8 Mon Sep 17 00:00:00 2001 From: Mark Eichin Date: Fri, 12 Aug 1994 17:33:47 +0000 Subject: [PATCH] gcc -Wall: clean up trash following #endifs.. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4125 dc483132-0cff-0310-8789-dd5450dbe970 --- src/appl/popper/pop_dele.c | 4 ++-- src/appl/popper/pop_dropcopy.c | 4 ++-- src/appl/popper/pop_dropinfo.c | 6 +++--- src/appl/popper/pop_get_command.c | 6 +++--- src/appl/popper/pop_init.c | 4 ++-- src/appl/popper/pop_last.c | 2 +- src/appl/popper/pop_list.c | 2 +- src/appl/popper/pop_log.c | 2 +- src/appl/popper/pop_lower.c | 2 +- src/appl/popper/pop_msg.c | 2 +- src/appl/popper/pop_parse.c | 2 +- src/appl/popper/pop_quit.c | 2 +- src/appl/popper/pop_rset.c | 2 +- src/appl/popper/pop_send.c | 2 +- src/appl/popper/pop_stat.c | 4 ++-- src/appl/popper/pop_updt.c | 10 +++++----- src/appl/popper/pop_xmit.c | 12 ++++++------ src/appl/popper/pop_xtnd.c | 2 +- src/appl/popper/popper.c | 4 ++-- src/appl/telnet/telnet/commands.c | 2 +- src/lib/crypto/des/f_parity.c | 2 +- src/util/et/compile_et.c | 2 +- 22 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/appl/popper/pop_dele.c b/src/appl/popper/pop_dele.c index 1c4d0bc95..bdd5f7b68 100644 --- a/src/appl/popper/pop_dele.c +++ b/src/appl/popper/pop_dele.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_dele.c 2.1 3/18/91"; -#endif not lint +#endif #include #include @@ -45,7 +45,7 @@ POP * p; if(p->debug) pop_log(p,POP_DEBUG,"Deleting message %u at offset %u of length %u\n", mp->number,mp->offset,mp->length); -#endif DEBUG +#endif /* Update the messages_deleted and bytes_deleted counters */ p->msgs_deleted++; diff --git a/src/appl/popper/pop_dropcopy.c b/src/appl/popper/pop_dropcopy.c index 155408418..0e9740649 100644 --- a/src/appl/popper/pop_dropcopy.c +++ b/src/appl/popper/pop_dropcopy.c @@ -58,7 +58,7 @@ struct passwd * pwp; if(p->debug) pop_log(p,POP_DEBUG,"Creating temporary maildrop '%s'", p->temp_drop); -#endif DEBUG +#endif /* Here we work to make sure the user doesn't cause us to remove or * write over existing files by limiting how much work we do while @@ -99,7 +99,7 @@ struct passwd * pwp; #ifdef DEBUG if(p->debug)pop_log(p,POP_DEBUG,"uid = %d, gid = %d",getuid(),getgid()); -#endif DEBUG +#endif /* Open for append, this solves the crash recovery problem */ if ((dfd = open(p->temp_drop,O_RDWR|O_APPEND|O_CREAT,0600)) == -1){ diff --git a/src/appl/popper/pop_dropinfo.c b/src/appl/popper/pop_dropinfo.c index c46da13e4..7a4eb328a 100644 --- a/src/appl/popper/pop_dropinfo.c +++ b/src/appl/popper/pop_dropinfo.c @@ -92,7 +92,7 @@ POP * p; pop_log(p,POP_DEBUG, "Msg %d at offset %d is %d octets long and has %u lines.", mp->number,mp->offset,mp->length,mp->lines); -#endif DEBUG +#endif ++mp; mp->number = msg_num; mp->length = 0; @@ -103,7 +103,7 @@ POP * p; #ifdef DEBUG if(p->debug) pop_log(p,POP_DEBUG, "Msg %d being added to list", mp->number); -#endif DEBUG +#endif } mp->length += nchar; p->drop_size += nchar; @@ -119,7 +119,7 @@ POP * p; "Msg %d at offset %d is %d octets long and has %u lines.", mp->number,mp->offset,mp->length,mp->lines); } -#endif DEBUG +#endif return(POP_SUCCESS); } diff --git a/src/appl/popper/pop_get_command.c b/src/appl/popper/pop_get_command.c index ebe962d82..d95621243 100644 --- a/src/appl/popper/pop_get_command.c +++ b/src/appl/popper/pop_get_command.c @@ -27,7 +27,7 @@ static state_table states[] = { auth2, "pass", 1, 1, pop_pass, {auth1, trans}, #ifdef RPOP auth2, "rpop", 1, 1, pop_rpop, {auth1, trans}, -#endif RPOP +#endif auth1, "quit", 0, 0, pop_quit, {halt, halt}, auth2, "quit", 0, 0, pop_quit, {halt, halt}, trans, "stat", 0, 0, pop_stat, {trans, trans}, @@ -54,7 +54,7 @@ register char * mp; /* Pointer to unparsed line /* Save a copy of the original client line */ #ifdef DEBUG if(p->debug) strcpy (buf,mp); -#endif DEBUG +#endif /* Parse the message into the parameter array */ if ((p->parm_count = pop_parse(p,mp)) < 0) return(NULL); @@ -70,7 +70,7 @@ register char * mp; /* Pointer to unparsed line pop_log(p,POP_DEBUG,"Received: \"%s\"",buf); } } -#endif DEBUG +#endif /* Search for the POP command in the command/state table */ for (s = states; s->command; s++) { diff --git a/src/appl/popper/pop_init.c b/src/appl/popper/pop_init.c index 9caf4f926..66dd1ee98 100644 --- a/src/appl/popper/pop_init.c +++ b/src/appl/popper/pop_init.c @@ -219,7 +219,7 @@ char ** argmessage; p->client = p->ipaddr; } } -#endif BIND43 +#endif } /* Create input file stream for TCP/IP communication */ @@ -247,7 +247,7 @@ char ** argmessage; trace_file_name); else if (p->debug) pop_log(p,POP_PRIORITY,"Debugging turned on"); -#endif DEBUG +#endif return(authenticate(p, &cs)); } diff --git a/src/appl/popper/pop_last.c b/src/appl/popper/pop_last.c index 53b3b8d1e..8dc07e5ef 100644 --- a/src/appl/popper/pop_last.c +++ b/src/appl/popper/pop_last.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_last.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_list.c b/src/appl/popper/pop_list.c index ac5aecb8a..eab504cff 100644 --- a/src/appl/popper/pop_list.c +++ b/src/appl/popper/pop_list.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_list.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_log.c b/src/appl/popper/pop_log.c index 76fdecb93..cc3e2a126 100644 --- a/src/appl/popper/pop_log.c +++ b/src/appl/popper/pop_log.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_log.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_lower.c b/src/appl/popper/pop_lower.c index 62054ed47..76d1b9295 100644 --- a/src/appl/popper/pop_lower.c +++ b/src/appl/popper/pop_lower.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_lower.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_msg.c b/src/appl/popper/pop_msg.c index 14ff52f10..6be286da4 100644 --- a/src/appl/popper/pop_msg.c +++ b/src/appl/popper/pop_msg.c @@ -64,7 +64,7 @@ va_dcl #ifdef DEBUG if (p->debug && stat == POP_SUCCESS) pop_log(p,POP_DEBUG,"%s",message); -#endif DEBUG +#endif /* Log the message if a failure occurred */ if (stat != POP_SUCCESS) diff --git a/src/appl/popper/pop_parse.c b/src/appl/popper/pop_parse.c index 20f67d618..742345b14 100644 --- a/src/appl/popper/pop_parse.c +++ b/src/appl/popper/pop_parse.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_parse.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_quit.c b/src/appl/popper/pop_quit.c index 212044db2..686d604ea 100644 --- a/src/appl/popper/pop_quit.c +++ b/src/appl/popper/pop_quit.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_quit.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_rset.c b/src/appl/popper/pop_rset.c index cf85385eb..da9002641 100644 --- a/src/appl/popper/pop_rset.c +++ b/src/appl/popper/pop_rset.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_rset.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/pop_send.c b/src/appl/popper/pop_send.c index bcfb10cb2..03a7881c9 100644 --- a/src/appl/popper/pop_send.c +++ b/src/appl/popper/pop_send.c @@ -114,7 +114,7 @@ char * buffer; #ifdef DEBUG if(p->debug)pop_log(p,POP_DEBUG,"Sending line \"%s\"",buffer); -#endif DEBUG +#endif /* Put a if a newline was removed from the buffer */ if (bp) (void)fputs ("\r\n",p->output); diff --git a/src/appl/popper/pop_stat.c b/src/appl/popper/pop_stat.c index d23935727..87e341692 100644 --- a/src/appl/popper/pop_stat.c +++ b/src/appl/popper/pop_stat.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_stat.c 2.2 3/18/91"; -#endif not lint +#endif #include #include @@ -22,7 +22,7 @@ POP * p; { #ifdef DEBUG if (p->debug) pop_log(p,POP_DEBUG,"%d message(s) (%d octets).",p->msg_count-p->msgs_deleted,p->drop_size-p->bytes_deleted); -#endif DEBUG +#endif return (pop_msg (p,POP_SUCCESS, "%u %u",p->msg_count-p->msgs_deleted,p->drop_size-p->bytes_deleted)); } diff --git a/src/appl/popper/pop_updt.c b/src/appl/popper/pop_updt.c index f10730ac7..2b4752c52 100644 --- a/src/appl/popper/pop_updt.c +++ b/src/appl/popper/pop_updt.c @@ -63,7 +63,7 @@ POP * p; pop_log(p,POP_DEBUG,"Performing maildrop update..."); pop_log(p,POP_DEBUG,"Checking to see if all messages were deleted"); } -#endif DEBUG +#endif if (p->msgs_deleted == p->msg_count) { /* Truncate before close, to avoid race condition, DO NOT UNLINK! @@ -76,7 +76,7 @@ POP * p; #ifdef DEBUG if (p->debug) pop_log(p,POP_DEBUG,"Opening mail drop \"%s\"",p->drop_name); -#endif DEBUG +#endif /* Open the user's real maildrop */ if ((mfd = open(p->drop_name,O_RDWR|O_CREAT,0600)) == -1 || @@ -133,7 +133,7 @@ POP * p; if (p->debug) pop_log(p,POP_DEBUG,"Creating new maildrop \"%s\" from \"%s\"", p->drop_name,p->temp_drop); -#endif DEBUG +#endif for (msg_num = 0; msg_num < p->msg_count; ++msg_num) { @@ -147,7 +147,7 @@ POP * p; if(p->debug) pop_log(p,POP_DEBUG, "Message %d flagged for deletion.",mp->number); -#endif DEBUG +#endif continue; } @@ -156,7 +156,7 @@ POP * p; #ifdef DEBUG if(p->debug) pop_log(p,POP_DEBUG,"Copying message %d.",mp->number); -#endif DEBUG +#endif begun = 0; for(status_written = doing_body = 0 ; diff --git a/src/appl/popper/pop_xmit.c b/src/appl/popper/pop_xmit.c index 21cbe61dd..0c903f965 100644 --- a/src/appl/popper/pop_xmit.c +++ b/src/appl/popper/pop_xmit.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_xmit.c 2.1 3/18/91"; -#endif not lint +#endif #include #include @@ -45,7 +45,7 @@ POP * p; pop_log(p,POP_DEBUG, "Creating temporary file for sending a mail message \"%s\"\n", temp_xmit); -#endif DEBUG +#endif if ((tmp = fopen(temp_xmit,"w+")) == NULL) return (pop_msg(p,POP_FAILURE, "Unable to create temporary message file \"%s\", errno = %d", @@ -57,12 +57,12 @@ POP * p; /* Receive the message */ #ifdef DEBUG if(p->debug)pop_log(p,POP_DEBUG,"Receiving mail message"); -#endif DEBUG +#endif while (fgets(buffer,MAXLINELEN,p->input)){ /* Look for initial period */ #ifdef DEBUG if(p->debug)pop_log(p,POP_DEBUG,"Receiving: \"%s\"",buffer); -#endif DEBUG +#endif if (*buffer == '.') { /* Exit on end of message */ if (strcmp(buffer,".\r\n") == 0) break; @@ -73,7 +73,7 @@ POP * p; #ifdef DEBUG if(p->debug)pop_log(p,POP_DEBUG,"Forking for \"%s\"",_PATH_SENDMAIL); -#endif DEBUG +#endif /* Send the message */ switch (pid = fork()) { case 0: @@ -86,7 +86,7 @@ POP * p; case -1: #ifdef DEBUG if (!p->debug) (void)unlink (temp_xmit); -#endif DEBUG +#endif return (pop_msg(p,POP_FAILURE, "Unable to execute \"%s\"",_PATH_SENDMAIL)); default: diff --git a/src/appl/popper/pop_xtnd.c b/src/appl/popper/pop_xtnd.c index cb3b07e3b..4c91810b9 100644 --- a/src/appl/popper/pop_xtnd.c +++ b/src/appl/popper/pop_xtnd.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)pop_xtnd.c 2.1 3/18/91"; -#endif not lint +#endif #include #include diff --git a/src/appl/popper/popper.c b/src/appl/popper/popper.c index e05020667..9e6cd4cd8 100644 --- a/src/appl/popper/popper.c +++ b/src/appl/popper/popper.c @@ -7,7 +7,7 @@ #ifndef lint static char copyright[] = "Copyright (c) 1990 Regents of the University of California.\nAll rights reserved.\n"; static char SccsId[] = "@(#)popper.c 2.1 3/18/91"; -#endif not lint +#endif #include #include @@ -110,4 +110,4 @@ register int len; } return(0); } -#endif STRNCASECMP +#endif diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c index 5dc314c1d..a78847a20 100644 --- a/src/appl/telnet/telnet/commands.c +++ b/src/appl/telnet/telnet/commands.c @@ -78,7 +78,7 @@ static char sccsid[] = "@(#)commands.c 8.1 (Berkeley) 6/6/93"; #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 64 -#endif MAXHOSTNAMELEN +#endif #if defined(IPPROTO_IP) && defined(IP_TOS) int tos = -1; diff --git a/src/lib/crypto/des/f_parity.c b/src/lib/crypto/des/f_parity.c index a2e216dca..887c71242 100644 --- a/src/lib/crypto/des/f_parity.c +++ b/src/lib/crypto/des/f_parity.c @@ -11,7 +11,7 @@ #ifndef lint static char rcsid_f_parity_c[] = "$Header$"; -#endif lint +#endif #include "des.h" diff --git a/src/util/et/compile_et.c b/src/util/et/compile_et.c index 79bd4c5b1..e9e2a6dc1 100644 --- a/src/util/et/compile_et.c +++ b/src/util/et/compile_et.c @@ -303,7 +303,7 @@ int yyerror(s) char *s; { #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strcasecmp.c 1.3 (Berkeley) 8/3/87"; -#endif LIBC_SCCS and not lint +#endif /* * This array is designed for mapping upper and lower case letter -- 2.26.2