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

T0404_inquiry_all_reported_vpd: fix compiler warnings

Browse Source 
* mark unused parameter as such
* wrap parens around a bitop
* remove unused labels
* fix error messages

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

17
test-tool/0404_inquiry_all_reported_vpd.c
View File

@@ -22,7 +22,8 @@
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-test.h" #include "iscsi-test.h"
int T0404_inquiry_all_reported_vpd(const char *initiator, const char *url, int data_loss, int show_info) int T0404_inquiry_all_reported_vpd(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;
@@ -91,7 +92,6 @@ int T0404_inquiry_all_reported_vpd(const char *initiator, const char *url, int d
} }
printf("[OK]\n"); printf("[OK]\n");
test2:
printf("Read each page and verify qualifier, type and page code:\n"); printf("Read each page and verify qualifier, type and page code:\n");
for (i = 0; i < inq->num_pages; i++) { for (i = 0; i < inq->num_pages; i++) {
struct scsi_task *pc_task; struct scsi_task *pc_task;
@@ -116,7 +116,8 @@ test2:
printf("Verify page 0x%02x qualifier ... ", inq->pages[i]); printf("Verify page 0x%02x qualifier ... ", inq->pages[i]);
if ((pc_task->datain.data[0] & 0xe0) >> 5 != inq->qualifier) { if ((pc_task->datain.data[0] & 0xe0) >> 5 != inq->qualifier) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("Qualifier differs between VPD pages\n", iscsi_get_error(iscsi)); printf("Qualifier differs between VPD pages: %x != %x\n",
pc_task->datain.data[0] & 0xe0, inq->qualifier);
ret = -1; ret = -1;
scsi_free_scsi_task(pc_task); scsi_free_scsi_task(pc_task);
continue; continue;
@@ -125,9 +126,10 @@ test2:
} }
printf("Verify page 0x%02x device type ... ", inq->pages[i]); printf("Verify page 0x%02x device type ... ", inq->pages[i]);
if (pc_task->datain.data[0] & 0x1f != inq->device_type) { if ((pc_task->datain.data[0] & 0x1f) != inq->device_type) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("Device Type differs between VPD pages\n", iscsi_get_error(iscsi)); printf("Device Type differs between VPD pages: %x != %x\n",
pc_task->datain.data[0] & 0x1f, inq->device_type);
ret = -1; ret = -1;
scsi_free_scsi_task(pc_task); scsi_free_scsi_task(pc_task);
continue; continue;
@@ -138,7 +140,8 @@ test2:
printf("Verify page 0x%02x page code ... ", inq->pages[i]); printf("Verify page 0x%02x page code ... ", inq->pages[i]);
if (pc_task->datain.data[1] != inq->pages[i]) { if (pc_task->datain.data[1] != inq->pages[i]) {
printf("[FAILED]\n"); printf("[FAILED]\n");
printf("Page code is wrong\n", iscsi_get_error(iscsi)); printf("Page code is wrong: %x != %x\n",
pc_task->datain.data[1], inq->pages[i]);
ret = -1; ret = -1;
scsi_free_scsi_task(pc_task); scsi_free_scsi_task(pc_task);
continue; continue;
@@ -149,8 +152,6 @@ test2:
scsi_free_scsi_task(pc_task); scsi_free_scsi_task(pc_task);
} }
test3:
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
finished: finished: