Module Name: othersrc
Committed By: agc
Date: Wed Aug 17 14:41:53 UTC 2011
Modified Files:
othersrc/external/bsd/iscsi/sbin/iscsictl: iscsic_main.c
Log Message:
don't use a -v command line argument to print the version - we have the
version command to do that
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c
diff -u othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c:1.2 othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c:1.3
--- othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c:1.2 Mon Aug 8 02:24:33 2011
+++ othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c Wed Aug 17 14:41:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_main.c,v 1.2 2011/08/08 02:24:33 agc Exp $ */
+/* $NetBSD: iscsic_main.c,v 1.3 2011/08/17 14:41:53 agc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -542,14 +542,11 @@
int i;
(void) snprintf(sockdir, sizeof(sockdir), "/tmp/iscsictl.XXXXXX");
- while ((i = getopt(argc, argv, "d:v")) != -1) {
+ while ((i = getopt(argc, argv, "d:")) != -1) {
switch(i) {
case 'd':
(void) snprintf(sockdir, sizeof(sockdir), "%s", optarg);
break;
- case 'v':
- printf("%s version %s\n", *argv, ISCSICTL_VERSION);
- break;
default:
break;
}
@@ -571,7 +568,8 @@
}
if ((driver = open(DEVICE, O_RDONLY)) < 0) {
warn("Opening " DEVICE);
-#ifndef ISCSI_DEBUG /* DEBUG ONLY: Allow CLI to operate w/o driver */
+#ifndef ISCSI_DEBUG
+ /* DEBUG ONLY: Allow CLI to operate w/o driver */
return EXIT_FAILURE;
#endif
}
