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

T0410_readtoc_basic: fix compiler warnings

Browse Source 
Remove unused labels and mark unused parameter as such.

Signed-off-by: Arne Redlich <arne.redlich@googlemail.com>
This commit is contained in:
Arne Redlich
2012-10-31 16:25:47 +01:00
parent 13c253f0dc
commit 88341c0a73
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
test-tool/0410_readtoc_basic.c
View File

@@ -1,16 +1,16 @@
/* /*
Copyright (C) 2012 by Jon Grimm <jon.grimm@gmail.com> Copyright (C) 2012 by Jon Grimm <jon.grimm@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 T0410_readtoc_basic(const char *initiator, const char *url, int data_loss, int show_info) int T0410_readtoc_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, *task1; struct scsi_task *task, *task1;
struct scsi_inquiry_standard *inq; struct scsi_inquiry_standard *inq;
@@ -132,13 +133,13 @@ int T0410_readtoc_basic(const char *initiator, const char *url, int data_loss, i
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
goto finished; goto finished;
} }
/* LBA will return 0, if the medium is blank. */ /* LBA will return 0, if the medium is blank. */
is_blank = rc10->lba ? 0 : 1; is_blank = rc10->lba ? 0 : 1;
} }
/* If we get 'medium not present' there is no medium in the drive */ /* If we get 'medium not present' there is no medium in the drive */
if (task->status == SCSI_STATUS_CHECK_CONDITION if (task->status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_NOT_READY && task->sense.key == SCSI_SENSE_NOT_READY
&& (task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT && (task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT
|| task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN || task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN
|| task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) { || task->sense.ascq == SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) {
no_medium = 1; no_medium = 1;
@@ -189,9 +190,9 @@ test1:
} }
if (task->status != SCSI_STATUS_CHECK_CONDITION if (task->status != SCSI_STATUS_CHECK_CONDITION
|| task->sense.key != SCSI_SENSE_NOT_READY || task->sense.key != SCSI_SENSE_NOT_READY
|| (task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN || (task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_OPEN
&& task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) { && task->sense.ascq != SCSI_SENSE_ASCQ_MEDIUM_NOT_PRESENT_TRAY_CLOSED)) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("READTOC failed but ascq was wrong. Should " printf("READTOC failed but ascq was wrong. Should "
"have failed with MEDIUM_NOT_PRESENT. " "have failed with MEDIUM_NOT_PRESENT. "
@@ -216,8 +217,8 @@ test1:
printf("READTOC Should have failed\n"); printf("READTOC Should have failed\n");
ret = -1; ret = -1;
} else if (task->status != SCSI_STATUS_CHECK_CONDITION } else if (task->status != SCSI_STATUS_CHECK_CONDITION
|| task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST || task->sense.key != SCSI_SENSE_ILLEGAL_REQUEST
|| task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) { || task->sense.ascq != SCSI_SENSE_ASCQ_INVALID_OPERATION_CODE) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("READTOC failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/INVALID OPERATION_CODE. Sense:%s\n", iscsi_get_error(iscsi)); printf("READTOC failed but ascq was wrong. Should have failed with ILLEGAL_REQUEST/INVALID OPERATION_CODE. Sense:%s\n", iscsi_get_error(iscsi));
ret = -1; ret = -1;
@@ -229,7 +230,6 @@ test1:
goto finished; goto finished;
} }
if (task->status != SCSI_STATUS_GOOD) { if (task->status != SCSI_STATUS_GOOD) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("READTOC command failed : %s\n", iscsi_get_error(iscsi)); printf("READTOC command failed : %s\n", iscsi_get_error(iscsi));
@@ -239,9 +239,6 @@ test1:
} }
printf("[OK]\n"); printf("[OK]\n");
test2:
/* If we get here, there is a disk loaded and it contains data */ /* If we get here, there is a disk loaded and it contains data */
printf("Verify we got at least 4 bytes of data for track 0 ... "); printf("Verify we got at least 4 bytes of data for track 0 ... ");
full_size = scsi_datain_getfullsize(task); full_size = scsi_datain_getfullsize(task);
@@ -262,8 +259,6 @@ test2:
} }
printf("[OK]\n"); printf("[OK]\n");
test3:
printf("Verify we can READTOC format 0000b (TOC) track 1 ... "); printf("Verify we can READTOC format 0000b (TOC) track 1 ... ");
task1 = iscsi_readtoc_sync(iscsi, lun, 0, 1, 0, 255); task1 = iscsi_readtoc_sync(iscsi, lun, 0, 1, 0, 255);
if (task1 == NULL) { if (task1 == NULL) {
@@ -284,8 +279,6 @@ test3:
} }
printf("[OK]\n"); printf("[OK]\n");
test4:
printf("Verify we got at least 4 bytes of data for track 1 ... "); printf("Verify we got at least 4 bytes of data for track 1 ... ");
full_size = scsi_datain_getfullsize(task1); full_size = scsi_datain_getfullsize(task1);
if (full_size < 4) { if (full_size < 4) {
@@ -307,7 +300,6 @@ test4:
} }
printf("[OK]\n"); printf("[OK]\n");
test5:
printf("Verify track 0 and 1 both returned the same data ... "); printf("Verify track 0 and 1 both returned the same data ... ");
if (list->num != list1->num || if (list->num != list1->num ||
list->first != list1->first || list->first != list1->first ||