Add rcsid. Change exit(-1). Use err() instead of warn()/exit().

13 files changed, 54 insertions, 46 deletions

diff --git a/usr.sbin/mrouted/callout.c b/usr.sbin/mrouted/callout.c
index 395199a..7de8baf 100644
--- a/usr.sbin/mrouted/callout.c
+++ b/usr.sbin/mrouted/callout.c
@@ -5,11 +5,13 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include "defs.h"
 
 /* the code below implements a callout queue */
diff --git a/usr.sbin/mrouted/config.c b/usr.sbin/mrouted/config.c
index 9b843b2..1f5c0cf 100644
--- a/usr.sbin/mrouted/config.c
+++ b/usr.sbin/mrouted/config.c
@@ -5,15 +5,15 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
-
 /*
  * Query the kernel to find network interfaces that are multicast-capable
  * and install them in the uvifs array.
diff --git a/usr.sbin/mrouted/igmp.c b/usr.sbin/mrouted/igmp.c
index d9e57f9..203bd26 100644
--- a/usr.sbin/mrouted/igmp.c
+++ b/usr.sbin/mrouted/igmp.c
@@ -5,15 +5,15 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
-
 /*
  * Exported variables.
  */
diff --git a/usr.sbin/mrouted/inet.c b/usr.sbin/mrouted/inet.c
index e540572..5af7218 100644
--- a/usr.sbin/mrouted/inet.c
+++ b/usr.sbin/mrouted/inet.c
@@ -5,15 +5,15 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
-
 /*
  * Exported variables.
  */
diff --git a/usr.sbin/mrouted/kern.c b/usr.sbin/mrouted/kern.c
index f37940f..5f29949 100644
--- a/usr.sbin/mrouted/kern.c
+++ b/usr.sbin/mrouted/kern.c
@@ -5,15 +5,15 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
-
 void k_set_rcvbuf(bufsize)
     int bufsize;
 {
diff --git a/usr.sbin/mrouted/main.c b/usr.sbin/mrouted/main.c
index 1b1efcf..40e53d3 100644
--- a/usr.sbin/mrouted/main.c
+++ b/usr.sbin/mrouted/main.c
@@ -20,7 +20,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id$";
+	"$Id: main.c,v 1.12 1997/09/30 06:15:01 charnier Exp $";
 #endif
 
 #include <err.h>
@@ -728,7 +728,7 @@ log(severity, syserr, format, va_alist)
 		syslog(severity, "%s", msg);
 	}
 
-	if (severity <= LOG_ERR) exit(-1);
+	if (severity <= LOG_ERR) exit(1);
     }
 }
 
diff --git a/usr.sbin/mrouted/mapper.c b/usr.sbin/mrouted/mapper.c
index aeef027..10fffb7 100644
--- a/usr.sbin/mrouted/mapper.c
+++ b/usr.sbin/mrouted/mapper.c
@@ -1,7 +1,5 @@
 /* Mapper for connections between MRouteD multicast routers.
  * Written by Pavel Curtis <Pavel@PARC.Xerox.Com>
- *
- * $Id: mapper.c,v 1.10 1997/02/22 16:06:57 peter Exp $
  */
 
 /*
@@ -21,6 +19,11 @@
  * These notices must be retained in any copies of any part of this software.
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <err.h>
 #include <string.h>
 #include <netdb.h>
@@ -201,7 +204,7 @@ log(severity, syserr, format, va_alist)
     }
 
     if (severity <= LOG_ERR)
-	exit(-1);
+	exit(1);
 }
 
 
diff --git a/usr.sbin/mrouted/mrinfo.c b/usr.sbin/mrouted/mrinfo.c
index 2266275..5a62e8a 100644
--- a/usr.sbin/mrouted/mrinfo.c
+++ b/usr.sbin/mrouted/mrinfo.c
@@ -61,7 +61,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$Id$";
+    "$Id: mrinfo.c,v 1.13 1997/09/30 06:15:08 charnier Exp $";
 /*  original rcsid:
     "@(#) Header: mrinfo.c,v 1.6 93/04/08 15:14:16 van Exp (LBL)";
 */
@@ -170,7 +170,7 @@ log(severity, syserr, format, va_alist)
 	}
 
 	if (severity <= LOG_ERR)
-		exit(-1);
+		exit(1);
 }
 
 /*
diff --git a/usr.sbin/mrouted/mtrace.c b/usr.sbin/mrouted/mtrace.c
index 40e84af..575acd7 100644
--- a/usr.sbin/mrouted/mtrace.c
+++ b/usr.sbin/mrouted/mtrace.c
@@ -100,7 +100,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "$Id$";
+    "$Id: mtrace.c,v 1.12 1997/09/30 06:15:16 charnier Exp $";
 #endif
 
 #include <ctype.h>
@@ -2234,17 +2234,13 @@ char *argv[];
 	int error;
     
 	error = sysinfo(SI_HOSTNAME, myhostname, sizeof(myhostname));
-	if (error == -1) {
-	    warn("getting my hostname");
-	    exit(-1);
-	}
+	if (error == -1)
+	    err(1, "getting my hostname");
 
 	hp = gethostbyname(myhostname);
 	if (hp == NULL || hp->h_addrtype != AF_INET ||
-	    hp->h_length != sizeof(addr.sin_addr)) {
-	    warn("finding IP address for my hostname");
-	    exit(-1);
-	}
+	    hp->h_length != sizeof(addr.sin_addr))
+	    err(1, "finding IP address for my hostname");
 
 	memcpy((char *)&addr.sin_addr.s_addr, hp->h_addr, hp->h_length);
     }
@@ -2668,7 +2664,7 @@ log(severity, syserr, format, va_alist)
 	    else
 		fprintf(stderr, ": errno %d\n", syserr);
     }
-    if (severity <= LOG_ERR) exit(-1);
+    if (severity <= LOG_ERR) exit(1);
 }
 
 /* dummies */
diff --git a/usr.sbin/mrouted/prune.c b/usr.sbin/mrouted/prune.c
index d18137e..23ba638 100644
--- a/usr.sbin/mrouted/prune.c
+++ b/usr.sbin/mrouted/prune.c
@@ -5,11 +5,12 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id: prune.c,v 1.13 1997/02/22 16:07:03 peter Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
diff --git a/usr.sbin/mrouted/route.c b/usr.sbin/mrouted/route.c
index 9ed2bb4..1e26fb5 100644
--- a/usr.sbin/mrouted/route.c
+++ b/usr.sbin/mrouted/route.c
@@ -5,15 +5,15 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 
-
 /*
  * This define statement saves a lot of space later
  */
diff --git a/usr.sbin/mrouted/rsrr.c b/usr.sbin/mrouted/rsrr.c
index b447f1a..d0771ec 100644
--- a/usr.sbin/mrouted/rsrr.c
+++ b/usr.sbin/mrouted/rsrr.c
@@ -30,6 +30,11 @@
 
 /* May 1995 -- Added support for Route Change Notification */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #ifdef RSRR
 
 #include "defs.h"
diff --git a/usr.sbin/mrouted/vif.c b/usr.sbin/mrouted/vif.c
index 9212585..681585a 100644
--- a/usr.sbin/mrouted/vif.c
+++ b/usr.sbin/mrouted/vif.c
@@ -5,11 +5,12 @@
  *
  * The mrouted program is COPYRIGHT 1989 by The Board of Trustees of
  * Leland Stanford Junior University.
- *
- *
- * $Id$
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
 
 #include "defs.h"
 #include <fcntl.h>