gcc -Wall: clean up trash following #endifs..

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4125 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/popper/pop_dele.c b/src/appl/popper/pop_dele.c
index 1c4d0bc95bb07b1cb3507453ec43495f270daa4e..bdd5f7b6869b7046c7dfcbd33fe3560813006830 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>
@@ -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 155408418fc178af41798b302be6ba4045686f80..0e974064997b797115c1a4258162d380c88b722f 100644 (file)
--- 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 c46da13e47102454d6936b03a0217d9d13af6068..7a4eb328a3f8f645c6e7bcf93a155910e42ac907 100644 (file)
--- 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 ebe962d82463afa82b092cb35d3a1041cb906079..d9562124341c4e1ced49ae8d3add10c0615be5f4 100644 (file)
--- 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 9caf4f9267c5f12ce7f892f8394dbf62cbcbed8f..66dd1ee981cc88d85596a29379f26a7b15efeb85 100644 (file)
--- 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 53b3b8d1ed0bf40bf27f7475665a66a4ebf335df..8dc07e5ef134ffa198e41a45a2ca2995abb1fbd3 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_list.c b/src/appl/popper/pop_list.c
index ac5aecb8a5533f23e2ff9a7704a7c8d20857767c..eab504cff9def12fd358c7d9fcde569c6a53d8ad 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_log.c b/src/appl/popper/pop_log.c
index 76fdecb93af57608699852d48297fadf8e05295b..cc3e2a12641aecf5dc253bdccd901ce21db62a24 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_lower.c b/src/appl/popper/pop_lower.c
index 62054ed47400b829c2da7dc6e47caae9174a362d..76d1b92957fcf4eb162fb8dd716e3d6d7d296da3 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_msg.c b/src/appl/popper/pop_msg.c
index 14ff52f1029c2ea628c65c9df7306c6cd8115e8d..6be286da49dae6e96cfc0331dfec083fd7aed411 100644 (file)
--- 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 20f67d6183ddc78c1ce2bfc777e15f5f07d5eaa4..742345b14bd3873ea80dde8098a202ca157d3a9c 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_quit.c b/src/appl/popper/pop_quit.c
index 212044db2c71f3dfd6c3c2f094991c2aafb49504..686d604ea2d3937a1afe72060826c39f4760119b 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_rset.c b/src/appl/popper/pop_rset.c
index cf85385ebc53cf4989532037b92f12a529b42f7f..da90026419dfbec5516028dbe64f50dcb05922fe 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/pop_send.c b/src/appl/popper/pop_send.c
index bcfb10cb2a8201c3d3c9d12dbc65e523b072d491..03a7881c985771f3284c1f4bb4edd157f2bee48e 100644 (file)
--- 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 <CR><NL> 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 d23935727491648f99c633787512216c128243ab..87e34169236a0023502df516acb8b38c6f77a208 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>
@@ -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 f10730ac71b8d5fca25bb0d363c253631f7e0bbf..2b4752c52a05e9ffd8404daaea415ce87759e913 100644 (file)
--- 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 21cbe61dda4c16a636b2ce8c0c41e1b031e9b375..0c903f9651577a1d07ac7c7fa70a162e76f7babd 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>
@@ -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 cb3b07e3b96533c6eacf1dc67ab692643eb06b00..4c91810b93b656db6d42135becafee75f8929cde 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>

diff --git a/src/appl/popper/popper.c b/src/appl/popper/popper.c
index e050206675c823558ab2e7c13fc65dc8af16dc57..9e6cd4cd827ce53ee77bc1d9e5c0a146a9949b45 100644 (file)
--- 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 <stdio.h>
 #include <sys/types.h>
@@ -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 5dc314c1d750c46e0a7175776d3ace5ee19344ba..a78847a2021ed9936f5451ffd3a3b895b35c9709 100644 (file)
--- 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 a2e216dca58936a26fa8d3300a77677159b3155f..887c712420b4a3f75090741c2fe2c31d18aef526 100644 (file)
--- 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 79bd4c5b1dd7b5b80de07a944b2a518feb64af5c..e9e2a6dc18f65814ba87b66f58a36ba1de53cd2f 100644 (file)
--- 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