Merge branch 'public'

[tripe] / proxy / tripe-mitm.c

diff --git a/proxy/tripe-mitm.c b/proxy/tripe-mitm.c
index 9aa29901dda5756946376f49bf3db5c738e2fdf5..7394aaaa53456fd7590c4f83c94d536ad5d9d4cf 100644 (file)
--- a/proxy/tripe-mitm.c
+++ b/proxy/tripe-mitm.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * An evil proxy for TrIPE
  *
  * (c) 2001 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Trivial IP Encryption (TrIPE).
  *
@@ -15,12 +13,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * TrIPE is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with TrIPE; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -483,7 +481,7 @@ static void floodtimer(struct timeval *tv, void *vv)
   PASS(f->p->f, buf, sz);
   setflood(f);
 }
-  
+
 static void setflood(flood *f)
 {
   struct timeval tv;
@@ -603,14 +601,10 @@ static void parse(char *p)
 /*----- Main driver -------------------------------------------------------*/
 
 static void version(FILE *fp)
-{
-  pquis(fp, "$, TrIPE version " VERSION "\n");
-}
+  { pquis(fp, "$, TrIPE version " VERSION "\n"); }
 
 static void usage(FILE *fp)
-{
-  pquis(fp, "Usage: $ [-k KEYRING] DIRECTIVE...\n");
-}
+  { pquis(fp, "Usage: $ [-k KEYRING] DIRECTIVE...\n"); }
 
 static void help(FILE *fp)
 {