Fix comments and styles. Delete unused variables and labels.

No binary changes.

ok mcbride henning

10 files changed, 19 insertions, 18 deletions

diff --git a/usr.sbin/npppd/common/addr_range.c b/usr.sbin/npppd/common/addr_range.c
index fd1637a148b..5d259b90996 100644
--- a/usr.sbin/npppd/common/addr_range.c
+++ b/usr.sbin/npppd/common/addr_range.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: addr_range.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: addr_range.c,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -56,7 +56,7 @@
  * Author:
  *	Yasuoka Masahiko <yasuoka@iij.ad.jp>
  *
- * $Id: addr_range.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $
+ * $Id: addr_range.c,v 1.3 2012/05/08 13:15:11 yasuoka Exp $
  */
 #ifdef ADDR_RANGE_DEBUG
 #define IIJDEBUG
diff --git a/usr.sbin/npppd/common/addr_range.h b/usr.sbin/npppd/common/addr_range.h
index 9ebb6bd93ed..5f72a6b2c59 100644
--- a/usr.sbin/npppd/common/addr_range.h
+++ b/usr.sbin/npppd/common/addr_range.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: addr_range.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: addr_range.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
diff --git a/usr.sbin/npppd/common/bytebuf.c b/usr.sbin/npppd/common/bytebuf.c
index 872c0f8fe40..786fdfc15a9 100644
--- a/usr.sbin/npppd/common/bytebuf.c
+++ b/usr.sbin/npppd/common/bytebuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bytebuf.c,v 1.4 2012/02/24 06:19:00 guenther Exp $ */
+/*	$OpenBSD: bytebuf.c,v 1.5 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -41,7 +41,7 @@
  *	}</pre>
  *
  * @author Yasuoka Masahiko
- * $Id: bytebuf.c,v 1.4 2012/02/24 06:19:00 guenther Exp $
+ * $Id: bytebuf.c,v 1.5 2012/05/08 13:15:11 yasuoka Exp $
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/npppd/common/bytebuf.h b/usr.sbin/npppd/common/bytebuf.h
index 7127ac70c6a..d7110d243c6 100644
--- a/usr.sbin/npppd/common/bytebuf.h
+++ b/usr.sbin/npppd/common/bytebuf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bytebuf.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: bytebuf.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -27,7 +27,7 @@
 #ifndef	BYTEBUF_H
 #define	BYTEBUF_H 1
 
-/* $Id: bytebuf.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/* $Id: bytebuf.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 
 typedef struct _bytebuffer bytebuffer;
 
diff --git a/usr.sbin/npppd/common/config_helper.c b/usr.sbin/npppd/common/config_helper.c
index 5282d560cd3..30bab8488bb 100644
--- a/usr.sbin/npppd/common/config_helper.c
+++ b/usr.sbin/npppd/common/config_helper.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config_helper.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/*	$OpenBSD: config_helper.c,v 1.4 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: config_helper.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/* $Id: config_helper.c,v 1.4 2012/05/08 13:15:11 yasuoka Exp $ */
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/usr.sbin/npppd/common/config_helper.h b/usr.sbin/npppd/common/config_helper.h
index 812e9763b60..fe79781ce66 100644
--- a/usr.sbin/npppd/common/config_helper.h
+++ b/usr.sbin/npppd/common/config_helper.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: config_helper.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: config_helper.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
diff --git a/usr.sbin/npppd/common/csvreader.c b/usr.sbin/npppd/common/csvreader.c
index f47d9d36c73..c905ece84fd 100644
--- a/usr.sbin/npppd/common/csvreader.c
+++ b/usr.sbin/npppd/common/csvreader.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csvreader.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/*	$OpenBSD: csvreader.c,v 1.4 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -54,7 +54,7 @@
  *   csvreader_destroy(csv);
  *</pre>
  */
-/* $Id: csvreader.c,v 1.3 2010/07/02 21:20:57 yasuoka Exp $ */
+/* $Id: csvreader.c,v 1.4 2012/05/08 13:15:11 yasuoka Exp $ */
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/npppd/common/csvreader.h b/usr.sbin/npppd/common/csvreader.h
index 0d53c6aab90..6e0c3fbeaf4 100644
--- a/usr.sbin/npppd/common/csvreader.h
+++ b/usr.sbin/npppd/common/csvreader.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: csvreader.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: csvreader.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 #ifndef CSVREADER_H
 #define CSVREADER_H 1
-/* $Id: csvreader.h,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/* $Id: csvreader.h,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 
 /** status of cvsreader */
 typedef enum _CSVREADER_STATUS {
diff --git a/usr.sbin/npppd/common/csvreader_test.c b/usr.sbin/npppd/common/csvreader_test.c
index b5b329f3d00..40812e413e4 100644
--- a/usr.sbin/npppd/common/csvreader_test.c
+++ b/usr.sbin/npppd/common/csvreader_test.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: csvreader_test.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/*	$OpenBSD: csvreader_test.c,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 /*-
  * Copyright (c) 2009 Internet Initiative Japan Inc.
  * All rights reserved.
@@ -27,7 +27,7 @@
 /*
  * cc -o csvreader_test csvreader.c csvreader_test.c
  */
-/* $Id: csvreader_test.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/* $Id: csvreader_test.c,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.sbin/npppd/common/net_utils.c b/usr.sbin/npppd/common/net_utils.c
index 76519143e13..467328f9072 100644
--- a/usr.sbin/npppd/common/net_utils.c
+++ b/usr.sbin/npppd/common/net_utils.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* $Id: net_utils.c,v 1.2 2010/07/01 03:38:17 yasuoka Exp $ */
+/* $Id: net_utils.c,v 1.3 2012/05/08 13:15:11 yasuoka Exp $ */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -87,8 +87,9 @@ get_ifname_by_sockaddr(struct sockaddr *sa, char *ifname)
 
 	return ifname0;
 }
+
 /**
- * Cconvert argument like "192.168.160.1:1723/tcp" or "[::1]:1723/tcp" to
+ * Convert argument like "192.168.160.1:1723/tcp" or "[::1]:1723/tcp" to
  * match getaddrinfo(3)'s specification and pass them to getaddrinfo(3).
  */
 int