[src/trunk]: src/sys/netbt Make it compile without options DIAGNOSTIC by remo...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9c2ee687761d
branches:  trunk
changeset: 329320:9c2ee687761d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 19 15:44:04 2014 +0000

description:
Make it compile without options DIAGNOSTIC by removing a variable only set
once and only tested once in an assert.

diffstat:

 sys/netbt/rfcomm_socket.c |  8 +++-----
 sys/netbt/sco_socket.c    |  8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r 5970b23d64a0 -r 9c2ee687761d sys/netbt/rfcomm_socket.c
--- a/sys/netbt/rfcomm_socket.c Mon May 19 14:57:37 2014 +0000
+++ b/sys/netbt/rfcomm_socket.c Mon May 19 15:44:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rfcomm_socket.c,v 1.13 2014/05/19 02:51:24 rmind Exp $ */
+/*     $NetBSD: rfcomm_socket.c,v 1.14 2014/05/19 15:44:04 martin Exp $        */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.13 2014/05/19 02:51:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_socket.c,v 1.14 2014/05/19 15:44:04 martin Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -119,9 +119,7 @@
 static void
 rfcomm_detach1(struct socket *so)
 {
-       struct rfcomm_dlc *pcb = so->so_pcb;
-
-       KASSERT(pcb != NULL);
+       KASSERT(so->so_pcb != NULL);
        rfcomm_detach((struct rfcomm_dlc **)&so->so_pcb);
        KASSERT(so->so_pcb == NULL);
 }
diff -r 5970b23d64a0 -r 9c2ee687761d sys/netbt/sco_socket.c
--- a/sys/netbt/sco_socket.c    Mon May 19 14:57:37 2014 +0000
+++ b/sys/netbt/sco_socket.c    Mon May 19 15:44:04 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sco_socket.c,v 1.14 2014/05/19 02:51:24 rmind Exp $    */
+/*     $NetBSD: sco_socket.c,v 1.15 2014/05/19 15:44:04 martin Exp $   */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.14 2014/05/19 02:51:24 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sco_socket.c,v 1.15 2014/05/19 15:44:04 martin Exp $");
 
 /* load symbolic names */
 #ifdef BLUETOOTH_DEBUG
@@ -102,9 +102,7 @@
 static void
 sco_detach1(struct socket *so)
 {
-       struct sco_pcb *pcb = (struct sco_pcb *)so->so_pcb;
-
-       KASSERT(pcb != NULL);
+       KASSERT(so->so_pcb != NULL);
        sco_detach((struct sco_pcb **)&so->so_pcb);
        KASSERT(so->so_pcb == NULL);
 }