From uqs@spoerlein.net  Wed Oct 28 19:24:32 2009
Return-Path: <uqs@spoerlein.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8A1D106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Oct 2009 19:24:31 +0000 (UTC)
	(envelope-from uqs@spoerlein.net)
Received: from acme.spoerlein.net (cl-43.dus-01.de.sixxs.net [IPv6:2a01:198:200:2a::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 9011B8FC14
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Oct 2009 19:24:31 +0000 (UTC)
Received: from roadrunner.spoerlein.net (pD9E5F210.dip.t-dialin.net [217.229.242.16])
	by acme.spoerlein.net (8.14.3/8.14.3) with ESMTP id n9SJOSdf020400
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Oct 2009 20:24:29 +0100 (CET)
	(envelope-from uqs@spoerlein.net)
Received: from roadrunner.spoerlein.net (localhost [127.0.0.1])
	by roadrunner.spoerlein.net (8.14.3/8.14.3) with ESMTP id n9SJLru9004497
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 28 Oct 2009 20:21:53 +0100 (CET)
	(envelope-from uqs@roadrunner.spoerlein.net)
Received: (from uqs@localhost)
	by roadrunner.spoerlein.net (8.14.3/8.14.3/Submit) id n9SJLrhG004496;
	Wed, 28 Oct 2009 20:21:53 +0100 (CET)
	(envelope-from uqs)
Message-Id: <200910281921.n9SJLrhG004496@roadrunner.spoerlein.net>
Date: Wed, 28 Oct 2009 20:21:53 +0100 (CET)
From: Ulrich Spoerlein <uqs@spoerlein.net>
To: FreeBSD-gnats-submit@freebsd.org
Subject: nos-tun(8) WARNS=3 cleanup
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         140060
>Category:       bin
>Synopsis:       [patch] nos-tun(8) WARNS=3 cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    uqs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 28 19:30:02 UTC 2009
>Closed-Date:    Wed Mar 10 21:48:27 UTC 2010
>Last-Modified:  Wed Mar 10 21:48:27 UTC 2010
>Originator:     Ulrich Spoerlein
>Release:        FreeBSD 9.0-CURRENT i386
>Organization:
>Environment:
	
>Description:
- Fixes more or less compatible to the DragonflyBSD work
- Code would be WARNS=6 clean, if it wasn't for increased alignment warnings

	
>How-To-Repeat:
	
>Fix:

	

--- nostun.diff begins here ---
diff -r 6770add1b4ad -r 4e35b87f9d20 sbin/nos-tun/Makefile
--- a/sbin/nos-tun/Makefile	Wed Oct 28 20:11:13 2009 +0100
+++ b/sbin/nos-tun/Makefile	Wed Oct 28 20:19:29 2009 +0100
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PROG=	nos-tun
-WARNS?=	0
 MAN=	nos-tun.8
+WARNS?=	3
 
 .include <bsd.prog.mk>
 
diff -r 6770add1b4ad -r 4e35b87f9d20 sbin/nos-tun/nos-tun.c
--- a/sbin/nos-tun/nos-tun.c	Wed Oct 28 20:11:13 2009 +0100
+++ b/sbin/nos-tun/nos-tun.c	Wed Oct 28 20:19:29 2009 +0100
@@ -89,7 +89,8 @@
 
 static void usage(void);
 
-int Set_address(char *addr, struct sockaddr_in *sin)
+static int
+Set_address(char *addr, struct sockaddr_in *sin)
 {
   struct hostent *hp;
 
@@ -107,15 +108,16 @@
   return 0;
 }
 
-int tun_open(char *devname, struct sockaddr *ouraddr, char *theiraddr)
+static int
+tun_open(char *dev_name, struct sockaddr *ouraddr, char *theiraddr)
 {
   int s;
   struct sockaddr_in *sin;
 
   /* Open tun device */
-  tun = open (devname, O_RDWR);
+  tun = open (dev_name, O_RDWR);
   if (tun < 0) {
-    syslog(LOG_ERR,"can't open %s - %m",devname);
+    syslog(LOG_ERR,"can't open %s - %m",dev_name);
     return(1);
   }
 
@@ -125,8 +127,8 @@
   bzero((char *)&ifra, sizeof(ifra));
   bzero((char *)&ifrq, sizeof(ifrq));
 
-  strncpy(ifrq.ifr_name, devname+5, IFNAMSIZ);
-  strncpy(ifra.ifra_name, devname+5, IFNAMSIZ);
+  strncpy(ifrq.ifr_name, dev_name+5, IFNAMSIZ);
+  strncpy(ifra.ifra_name, dev_name+5, IFNAMSIZ);
 
   s = socket(AF_INET, SOCK_DGRAM, 0);
   if (s < 0) {
@@ -189,7 +191,8 @@
   return(1);
 }
 
-void Finish(int signum)
+static void
+Finish(int signum)
 {
   int s;
 
@@ -238,7 +241,7 @@
 {
   int  c, len, ipoff;
 
-  char *devname = NULL;
+  char *dev_name = NULL;
   char *point_to = NULL;
   char *to_point = NULL;
   char *target;
@@ -268,7 +271,7 @@
       point_to = optarg;
       break;
     case 't':
-      devname = optarg;
+      dev_name = optarg;
       break;
     case 'p':
       protocol = optarg;
@@ -278,7 +281,7 @@
   argc -= optind;
   argv += optind;
 
-  if ((argc != 1 && argc != 2) || (devname == NULL) ||
+  if ((argc != 1 && argc != 2) || (dev_name == NULL) ||
       (point_to == NULL) || (to_point == NULL)) {
     usage();
   }
@@ -302,7 +305,7 @@
     exit(2);
   }
 
-  if(tun_open(devname, &t_laddr, to_point)) {
+  if(tun_open(dev_name, &t_laddr, to_point)) {
     closelog();
     exit(3);
   }
--- nostun.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->uqs 
Responsible-Changed-By: uqs 
Responsible-Changed-When: Thu Feb 4 08:58:31 UTC 2010 
Responsible-Changed-Why:  
Take my own PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140060 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/140060: commit references a PR
Date: Wed, 10 Mar 2010 18:51:23 +0000 (UTC)

 Author: uqs
 Date: Wed Mar 10 18:51:13 2010
 New Revision: 204966
 URL: http://svn.freebsd.org/changeset/base/204966
 
 Log:
   nos-tun(8): make WARNS=3 clean
   
   The renames are in spirit of DragonflyBSD, to keep diff minimal.
   
   PR:		bin/140060
   Approved by:	ed (co-mentor)
 
 Modified:
   head/sbin/nos-tun/Makefile
   head/sbin/nos-tun/nos-tun.c
 
 Modified: head/sbin/nos-tun/Makefile
 ==============================================================================
 --- head/sbin/nos-tun/Makefile	Wed Mar 10 18:30:55 2010	(r204965)
 +++ head/sbin/nos-tun/Makefile	Wed Mar 10 18:51:13 2010	(r204966)
 @@ -1,8 +1,8 @@
  # $FreeBSD$
  
  PROG=	nos-tun
 -WARNS?=	0
  MAN=	nos-tun.8
 +WARNS?=	3
  
  .include <bsd.prog.mk>
  
 
 Modified: head/sbin/nos-tun/nos-tun.c
 ==============================================================================
 --- head/sbin/nos-tun/nos-tun.c	Wed Mar 10 18:30:55 2010	(r204965)
 +++ head/sbin/nos-tun/nos-tun.c	Wed Mar 10 18:51:13 2010	(r204966)
 @@ -89,7 +89,8 @@ int tun;                          /* tun
  
  static void usage(void);
  
 -int Set_address(char *addr, struct sockaddr_in *sin)
 +static int
 +Set_address(char *addr, struct sockaddr_in *sin)
  {
    struct hostent *hp;
  
 @@ -107,15 +108,16 @@ int Set_address(char *addr, struct socka
    return 0;
  }
  
 -int tun_open(char *devname, struct sockaddr *ouraddr, char *theiraddr)
 +static int
 +tun_open(char *dev_name, struct sockaddr *ouraddr, char *theiraddr)
  {
    int s;
    struct sockaddr_in *sin;
  
    /* Open tun device */
 -  tun = open (devname, O_RDWR);
 +  tun = open(dev_name, O_RDWR);
    if (tun < 0) {
 -    syslog(LOG_ERR,"can't open %s - %m",devname);
 +    syslog(LOG_ERR,"can't open %s - %m", dev_name);
      return(1);
    }
  
 @@ -125,8 +127,8 @@ int tun_open(char *devname, struct socka
    bzero((char *)&ifra, sizeof(ifra));
    bzero((char *)&ifrq, sizeof(ifrq));
  
 -  strncpy(ifrq.ifr_name, devname+5, IFNAMSIZ);
 -  strncpy(ifra.ifra_name, devname+5, IFNAMSIZ);
 +  strncpy(ifrq.ifr_name, dev_name+5, IFNAMSIZ);
 +  strncpy(ifra.ifra_name, dev_name+5, IFNAMSIZ);
  
    s = socket(AF_INET, SOCK_DGRAM, 0);
    if (s < 0) {
 @@ -189,7 +191,8 @@ tunc_return:
    return(1);
  }
  
 -void Finish(int signum)
 +static void
 +Finish(int signum)
  {
    int s;
  
 @@ -238,7 +241,7 @@ int main (int argc, char **argv)
  {
    int  c, len, ipoff;
  
 -  char *devname = NULL;
 +  char *dev_name = NULL;
    char *point_to = NULL;
    char *to_point = NULL;
    char *target;
 @@ -268,7 +271,7 @@ int main (int argc, char **argv)
        point_to = optarg;
        break;
      case 't':
 -      devname = optarg;
 +      dev_name = optarg;
        break;
      case 'p':
        protocol = optarg;
 @@ -278,7 +281,7 @@ int main (int argc, char **argv)
    argc -= optind;
    argv += optind;
  
 -  if ((argc != 1 && argc != 2) || (devname == NULL) ||
 +  if ((argc != 1 && argc != 2) || (dev_name == NULL) ||
        (point_to == NULL) || (to_point == NULL)) {
      usage();
    }
 @@ -302,7 +305,7 @@ int main (int argc, char **argv)
      exit(2);
    }
  
 -  if(tun_open(devname, &t_laddr, to_point)) {
 +  if(tun_open(dev_name, &t_laddr, to_point)) {
      closelog();
      exit(3);
    }
 @@ -386,7 +389,7 @@ int main (int argc, char **argv)
  }
  
  static void
 -usage()
 +usage(void)
  {
  	fprintf(stderr,
  "usage: nos-tun -t tunnel -s source -d destination -p protocol_number [source] target\n");
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: uqs 
State-Changed-When: Wed Mar 10 21:48:26 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=140060 
>Unformatted:
