Trivial stylish changes, mostly to silence gcc.

Reviewed by:	Mike Spengler <mks@networkcs.com>
Submitted by:	phk

9 files changed, 58 insertions, 50 deletions

diff --git a/sys/netatm/spans/spans_arp.c b/sys/netatm/spans/spans_arp.c
index 5a2443a..bdcacc6 100644
--- a/sys/netatm/spans/spans_arp.c
+++ b/sys/netatm/spans/spans_arp.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $
+ *	@(#) $Id: spans_arp.c,v 1.1 1998/09/15 08:23:02 phk Exp $
  *
  */
 
@@ -35,10 +35,6 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <netatm/ipatm/ipatm_var.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: spans_arp.c,v 1.9 1998/06/29 22:03:12 mks Exp $"
 #include <netatm/spans/spans_var.h>
 #include <netatm/spans/spans_cls.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_arp.c,v 1.1 1998/09/15 08:23:02 phk Exp $");
+#endif
+
 
 /*
  * Global variables
diff --git a/sys/netatm/spans/spans_cls.c b/sys/netatm/spans/spans_cls.c
index f496311..f4a6ba8 100644
--- a/sys/netatm/spans/spans_cls.c
+++ b/sys/netatm/spans/spans_cls.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $
+ *	@(#) $Id: spans_cls.c,v 1.1 1998/09/15 08:23:03 phk Exp $
  *
  */
 
@@ -35,10 +35,6 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <netatm/ipatm/ipatm_var.h>
@@ -47,6 +43,10 @@ static char *RCSid = "@(#) $Id: spans_cls.c,v 1.11 1998/06/29 22:04:29 mks Exp $
 #include <netatm/spans/spans_var.h>
 #include <netatm/spans/spans_cls.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_cls.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
+#endif
+
 
 /*
  * Global variables
diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c
index 6546ae2..e03f36b 100644
--- a/sys/netatm/spans/spans_if.c
+++ b/sys/netatm/spans/spans_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $Id: spans_if.c,v 1.2 1998/09/17 09:35:00 phk Exp $
  *
  */
 
@@ -36,10 +36,6 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
 #ifndef ATM_SPANS_MODULE
 #include "opt_atm.h"
 #endif
@@ -49,6 +45,10 @@ static char *RCSid = "@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_if.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
 /*
  * Global variables
  */
diff --git a/sys/netatm/spans/spans_kxdr.c b/sys/netatm/spans/spans_kxdr.c
index b6534de..3843341 100644
--- a/sys/netatm/spans/spans_kxdr.c
+++ b/sys/netatm/spans/spans_kxdr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_kxdr.c,v 1.2 1997/05/06 22:17:00 mks Exp $
+ *	@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $
  *
  */
 
@@ -35,12 +35,12 @@
  *
  */
 
+#include <netatm/kern_include.h>
+
 #ifndef lint
-static char *RCSid = "@(#) $Id: spans_kxdr.c,v 1.2 1997/05/06 22:17:00 mks Exp $";
+__RCSID("@(#) $Id: spans_kxdr.c,v 1.1 1998/09/15 08:23:03 phk Exp $");
 #endif
 
-#include <netatm/kern_include.h>
-
 /*
  * This file contains code that has been copied and/or modified from
  * the following FreeBSD files:
diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c
index 1ce9a50..f04cc7f 100644
--- a/sys/netatm/spans/spans_msg.c
+++ b/sys/netatm/spans/spans_msg.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include <rpc/rpc.h>
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_msg.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
 /*
  * External functions
  */
diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c
index 117324c..96e963b 100644
--- a/sys/netatm/spans/spans_print.c
+++ b/sys/netatm/spans/spans_print.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $Id: spans_print.c,v 1.2 1998/09/17 09:35:00 phk Exp $
  *
  */
 
@@ -35,15 +35,15 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_print.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
 /*
  * If LONGPRINT is defined, every field of the SPANS message will be
  * printed.  If not, a shorter summary (useful for debugging without
@@ -54,11 +54,15 @@ static char *RCSid = "@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp
 /*
  * Local functions
  */
+static void	spans_msgtype_str __P((spans_msgtype *, char *));
+static void	spans_print_msgbody __P((spans_msgbody *));
+static void	spans_result_str __P((spans_result *, char *));
+
+#ifdef LONGPRINT
+
 static void	inc_indent __P((void));
 static void	dec_indent __P((void));
 static void	spans_aal_str __P((spans_aal *, char *));
-static void	spans_result_str __P((spans_result *, char *));
-static void	spans_msgtype_str __P((spans_msgtype *, char *));
 static void	spans_query_type_str __P((spans_query_type *, char *));
 static void	spans_state_str __P((spans_query_type *, char *));
 static void	spans_print_version __P((spans_version *));
@@ -101,7 +105,6 @@ static void	spans_print_parm_leave_cnf __P((spans_parm_leave_cnf *));
 static void	spans_print_parm_vcir_ind __P((spans_parm_vcir_ind *));
 static void	spans_print_parm_query_req __P((spans_parm_query_req *));
 static void	spans_print_parm_query_rsp __P((spans_parm_query_rsp *));
-static void	spans_print_msgbody __P((spans_msgbody *));
 
 
 /*
@@ -116,7 +119,7 @@ static void
 inc_indent()
 {
 	if (spans_indent != &indent_str[0]) {
-		*spans_indent--;
+		spans_indent--;
 	}
 }
 
@@ -124,7 +127,7 @@ static void
 dec_indent()
 {
 	if (spans_indent != INIT_INDENT) {
-		*spans_indent++;
+		spans_indent++;
 	}
 }
 
@@ -150,6 +153,8 @@ spans_aal_str(objp, dest)
 	}
 }
 
+#endif 
+
 static void
 spans_result_str(objp, dest)
 	spans_result *objp;
@@ -233,6 +238,8 @@ spans_msgtype_str(objp, dest)
 	sprintf(dest, "Invalid (%d)", (int)*objp);
 }
 
+#ifdef LONGPRINT 
+
 static void
 spans_query_type_str(objp, dest)
 	spans_query_type *objp;
@@ -273,7 +280,6 @@ spans_state_str(objp, dest)
 	}
 }
 
-#ifdef LONGPRINT
 
 static void
 spans_print_version(objp)
@@ -1055,7 +1061,9 @@ void
 spans_print_msg(objp)
 	spans_msg *objp;
 {
+#ifdef LONGPRINT
 	spans_indent = INIT_INDENT;
+#endif
 	spans_print_msgbody(&objp->sm_body);
 }
 
diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c
index b0e0f1e..2cd2f72 100644
--- a/sys/netatm/spans/spans_proto.c
+++ b/sys/netatm/spans/spans_proto.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $
+ *	@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $
  *
  */
 
@@ -35,15 +35,15 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_proto.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
 /*
  * Internal functions
  */
diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c
index a6e720f..b2a418c 100644
--- a/sys/netatm/spans/spans_subr.c
+++ b/sys/netatm/spans/spans_subr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $
+ *	@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $
  *
  */
 
@@ -35,15 +35,15 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_subr.c,v 1.2 1998/09/17 09:35:00 phk Exp $");
+#endif
+
 
 /*
  * Open a SPANS VCC
diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c
index f3f0235..904f176 100644
--- a/sys/netatm/spans/spans_util.c
+++ b/sys/netatm/spans/spans_util.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $
+ *	@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $
  *
  */
 
@@ -35,15 +35,15 @@
  *
  */
 
-#ifndef lint
-static char *RCSid = "@(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $";
-#endif
-
 #include <netatm/kern_include.h>
 
 #include "spans_xdr.h"
 #include <netatm/spans/spans_var.h>
 
+#ifndef lint
+__RCSID("@(#) $Id: spans_util.c,v 1.2 1998/09/17 09:35:01 phk Exp $");
+#endif
+
 
 #ifdef NOTDEF
 /* XXX -- Remove all SAP checks? */