[src/trunk]: src/sbin/iscsid Remove ISCSI_DEBUG branches.

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

details:   https://anonhg.NetBSD.org/src/rev/6db467657a09
branches:  trunk
changeset: 338568:6db467657a09
user:      joerg <joerg%NetBSD.org@localhost>
date:      Sat May 30 16:00:51 2015 +0000

description:
Remove ISCSI_DEBUG branches.

diffstat:

 sbin/iscsid/iscsid_driverif.c |  11 +----------
 sbin/iscsid/iscsid_main.c     |   9 ++-------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (63 lines):

diff -r 13f3ff32ebb6 -r 6db467657a09 sbin/iscsid/iscsid_driverif.c
--- a/sbin/iscsid/iscsid_driverif.c     Sat May 30 15:57:32 2015 +0000
+++ b/sbin/iscsid/iscsid_driverif.c     Sat May 30 16:00:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsid_driverif.c,v 1.6 2012/12/29 08:28:20 mlelstv Exp $      */
+/*     $NetBSD: iscsid_driverif.c,v 1.7 2015/05/30 16:00:51 joerg Exp $        */
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -70,11 +70,6 @@
 
        node_name = *par;
 
-#ifdef ISCSI_DEBUG                             /* DEBUG ONLY: Allow op without driver present */
-       if (driver < 0)
-               return ISCSID_STATUS_SUCCESS;
-#endif
-
        strlcpy((char *)snp.InitiatorName, (char *)par->InitiatorName,
                sizeof(snp.InitiatorName));
        strlcpy((char *)snp.InitiatorAlias, (char *)par->InitiatorAlias,
@@ -850,10 +845,6 @@
        ver->minor = VERSION_MINOR;
        strlcpy ((char *)ver->version_string, VERSION_STRING, sizeof(ver->version_string));
 
-#ifdef ISCSI_DEBUG                             /* DEBUG ONLY: Allow op without driver present */
-       if (driver < 0)
-               return;
-#endif
        ioctl(driver, ISCSI_GET_VERSION, &drv_ver);
        ver->driver_interface_version = drv_ver.interface_version;
        ver->driver_major = drv_ver.major;
diff -r 13f3ff32ebb6 -r 6db467657a09 sbin/iscsid/iscsid_main.c
--- a/sbin/iscsid/iscsid_main.c Sat May 30 15:57:32 2015 +0000
+++ b/sbin/iscsid/iscsid_main.c Sat May 30 16:00:51 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: iscsid_main.c,v 1.8 2012/12/29 08:28:20 mlelstv Exp $  */
+/*     $NetBSD: iscsid_main.c,v 1.9 2015/05/30 16:00:51 joerg Exp $    */
 
 /*-
  * Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -52,10 +52,7 @@
 int driver = -1;                               /* the driver's file desc */
 int client_sock;                               /* the client communication socket */
 
-#ifndef ISCSI_DEBUG
-#define ISCSI_DEBUG 0
-#endif
-int debug_level = ISCSI_DEBUG; /* How much info to display */
+int debug_level;       /* How much info to display */
 int nothreads;
 
 /*
@@ -134,9 +131,7 @@
 
        if ((driver = open(DEVICE, O_RDONLY)) < 0) {
                perror("opening " DEVICE);
-#ifndef ISCSI_DEBUG            /* DEBUG ONLY: Allow daemon to operate w/o driver */
                return -1;
-#endif
        }
 
        sock = socket(AF_UNIX, SOCK_DGRAM, 0);