warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

T0400_inquiry_basic: fix compiler warnings

Browse Source 
gcc complains about an unused parameter (mark it as such) and unused labels
(remove 'em).

Signed-off-by: Arne Redlich <arne.redlich@googlemail.com>
This commit is contained in:
Arne Redlich
2012-10-31 15:52:11 +01:00
parent 311a63c61d
commit 45ce1537f2
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test-tool/0400_inquiry_basic.c
+11 -13
View File
@@ -1,16 +1,16 @@
/* /*
Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com> Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
@@ -22,8 +22,9 @@
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-test.h" #include "iscsi-test.h"
int T0400_inquiry_basic(const char *initiator, const char *url, int data_loss, int show_info) int T0400_inquiry_basic(const char *initiator, const char *url, int data_loss _U_,
{ int show_info)
{
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
struct scsi_task *task; struct scsi_task *task;
struct scsi_inquiry_standard *inq; struct scsi_inquiry_standard *inq;
@@ -100,7 +101,6 @@ int T0400_inquiry_basic(const char *initiator, const char *url, int data_loss, i
} }
printf("[OK]\n"); printf("[OK]\n");
test2:
printf("Check that standard data is >= 36 bytes in size ... "); printf("Check that standard data is >= 36 bytes in size ... ");
if (full_size < 36) { if (full_size < 36) {
printf("[FAILED]\n"); printf("[FAILED]\n");
@@ -111,8 +111,6 @@ test2:
} }
printf("[OK]\n"); printf("[OK]\n");
test3:
printf("Check device-type is either of DISK, TAPE or CD/DVD ... "); printf("Check device-type is either of DISK, TAPE or CD/DVD ... ");
switch (inq->device_type) { switch (inq->device_type) {
case SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS: case SCSI_INQUIRY_PERIPHERAL_DEVICE_TYPE_DIRECT_ACCESS:
@@ -193,7 +191,7 @@ test9:
if (task->datain.data[i] >= 0x20 && task->datain.data[i] <= 0x7e) { if (task->datain.data[i] >= 0x20 && task->datain.data[i] <= 0x7e) {
continue; continue;
} }
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("VENDOR_IDENTIFICATION contains non-ASCII characters\n"); printf("VENDOR_IDENTIFICATION contains non-ASCII characters\n");
ret = -1; ret = -1;
@@ -211,7 +209,7 @@ test10:
if (task->datain.data[i] >= 0x20 && task->datain.data[i] <= 0x7e) { if (task->datain.data[i] >= 0x20 && task->datain.data[i] <= 0x7e) {
continue; continue;
} }
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("PRODUCT_IDENTIFICATION contains non-ASCII characters\n"); printf("PRODUCT_IDENTIFICATION contains non-ASCII characters\n");
ret = -1; ret = -1;
@@ -243,7 +241,7 @@ test12:
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("AERC is set but this device reports SPC-3 or later\n"); printf("AERC is set but this device reports SPC-3 or later\n");
ret = -1; ret = -1;
goto test13; goto test13;
} }
printf("[OK]\n"); printf("[OK]\n");
@@ -253,7 +251,7 @@ test13:
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("TrmTsk is set but this device reports SPC-2 or later\n"); printf("TrmTsk is set but this device reports SPC-2 or later\n");
ret = -1; ret = -1;
goto test14; goto test14;
} }
printf("[OK]\n"); printf("[OK]\n");