diff --git a/test-tool/0402_inquiry_evpd.c b/test-tool/0402_inquiry_evpd.c
index 6db9370..d33cbf5 100644
--- a/test-tool/0402_inquiry_evpd.c
+++ b/test-tool/0402_inquiry_evpd.c
@@ -1,16 +1,16 @@
-/* 
+/*
    Copyright (C) 2012 by Ronnie Sahlberg <ronniesahlberg@gmail.com>
-   
+
    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
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
@@ -22,8 +22,9 @@
 #include "scsi-lowlevel.h"
 #include "iscsi-test.h"
 
-int T0402_inquiry_evpd(const char *initiator, const char *url, int data_loss, int show_info)
-{ 
+int T0402_inquiry_evpd(const char *initiator, const char *url, int data_loss _U_,
+		       int show_info)
+{
 	struct iscsi_context *iscsi;
 	struct scsi_task *task;
 	int ret, lun, i;
@@ -55,14 +56,14 @@ int T0402_inquiry_evpd(const char *initiator, const char *url, int data_loss, in
 			printf("[FAILED]\n");
 			printf("Failed to send INQUIRY command : %s\n", iscsi_get_error(iscsi));
 			ret = -1;
-			goto test2;
+			goto finished;
 		}
 		if (task->status == SCSI_STATUS_GOOD) {
 			printf("[FAILED]\n");
 			printf("INQUIRY should have failed with CHECK_CONDITION/ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB %s\n", iscsi_get_error(iscsi));
 			scsi_free_scsi_task(task);
 			ret = -1;
-			goto test2;
+			goto finished;
 		}
 		if (task->status        != SCSI_STATUS_CHECK_CONDITION
 		    || task->sense.key  != SCSI_SENSE_ILLEGAL_REQUEST
@@ -71,15 +72,12 @@ int T0402_inquiry_evpd(const char *initiator, const char *url, int data_loss, in
 			printf("INQUIRY should have failed with wrong sense code. It failed with %s but should have failed with ILLEGAL_REQUEST/INVALID_FIELD_IN_CDB\n", iscsi_get_error(iscsi));
 			scsi_free_scsi_task(task);
 			ret = -1;
-			goto test2;
+			goto finished;
 		}
 		scsi_free_scsi_task(task);
 	}
 	printf("[OK]\n");
 
-test2:
-
-
 finished:
 	iscsi_logout_sync(iscsi);
 	iscsi_destroy_context(iscsi);