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

Enable -Wno-unused-parameter

Browse Source 
Instead of adding __attribute__((unused)) to unused arguments, add the
-Wno-unused-parameter compiler flag.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
This commit is contained in:
Bart Van Assche
2021-05-23 11:40:53 -07:00
parent ea6b2282d4
commit 2a5a0b3291
33 changed files with 71 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -12,7 +12,7 @@ endif
ACLOCAL_AMFLAGS =-I m4 ACLOCAL_AMFLAGS =-I m4
AUTOMAKE_OPTIONS = foreign subdir-objects AUTOMAKE_OPTIONS = foreign subdir-objects
AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" AM_CPPFLAGS=-I. -I$(srcdir)/include
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \

2
aros/Makefile.AROS
View File

@@ -1,6 +1,6 @@
AR=ar AR=ar
CC=gcc CC=gcc
CFLAGS=-g -O0 -DAROS=1 -D_U_=" " -DHAVE_SYS_TYPES_H -DHAVE_SOCKADDR_LEN -I. -Iinclude -Iaros CFLAGS=-g -O0 -DAROS=1 -DHAVE_SYS_TYPES_H -DHAVE_SOCKADDR_LEN -I. -Iinclude -Iaros
OBJS=lib/connect.o lib/crc32c.o lib/discovery.o lib/init.o lib/iscsi-command.o lib/logging.o lib/login.o lib/md5.o lib/nop.o lib/pdu.o lib/scsi-lowlevel.o lib/socket.o lib/sync.o lib/task_mgmt.o aros/aros_compat.o OBJS=lib/connect.o lib/crc32c.o lib/discovery.o lib/init.o lib/iscsi-command.o lib/logging.o lib/login.o lib/md5.o lib/nop.o lib/pdu.o lib/scsi-lowlevel.o lib/socket.o lib/sync.o lib/task_mgmt.o aros/aros_compat.o

6
aros/iscsi-ls.c
View File

@@ -219,7 +219,7 @@ void list_luns(struct client_state *clnt, const char *target, const char *portal
void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;
@@ -259,7 +259,7 @@ void discovery_cb(struct iscsi_context *iscsi, int status, void *command_data, v
} }
void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi));
@@ -272,7 +272,7 @@ void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_da
} }
} }
void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi));

1
configure.ac
View File

@@ -30,6 +30,7 @@ AC_ARG_ENABLE([werror], [AS_HELP_STRING([--disable-werror],
if test "$ac_cv_prog_gcc" = yes; then if test "$ac_cv_prog_gcc" = yes; then
WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wno-strict-aliasing -Wvla" WARN_CFLAGS="-Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wno-strict-aliasing -Wvla"
WARN_CFLAGS="$WARN_CFLAGS -Wno-unknown-warning-option -Wno-stringop-truncation" WARN_CFLAGS="$WARN_CFLAGS -Wno-unknown-warning-option -Wno-stringop-truncation"
WARN_CFLAGS="$WARN_CFLAGS -Wno-unused-parameter"
if test "x$enable_werror" != "xno"; then if test "x$enable_werror" != "xno"; then
WARN_CFLAGS="$WARN_CFLAGS -Werror" WARN_CFLAGS="$WARN_CFLAGS -Werror"
fi fi

2
examples/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" AM_CPPFLAGS=-I. -I${srcdir}/../include
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
AM_LDFLAGS=-no-undefined AM_LDFLAGS=-no-undefined
LIBS=../lib/libiscsi.la LIBS=../lib/libiscsi.la

4
examples/iscsi-dd.c
View File

@@ -102,7 +102,7 @@ void write_cb(struct iscsi_context *iscsi, int status, void *command_data, void
free(wt); free(wt);
} }
void read_cb(struct iscsi_context *iscsi _U_, int status, void *command_data, void *private_data) void read_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client *client = (struct client *)private_data; struct client *client = (struct client *)private_data;
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
@@ -276,7 +276,7 @@ void populate_param_header(unsigned char *buf, int list_id, int str, int list_id
buf[15] = inline_data_len & 0xFF; buf[15] = inline_data_len & 0xFF;
} }
void xcopy_cb(struct iscsi_context *iscsi _U_, int status, void *command_data, void *private_data) void xcopy_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client *client = (struct client *)private_data; struct client *client = (struct client *)private_data;
struct scsi_task *task = command_data; struct scsi_task *task = command_data;

20
examples/iscsiclient.c
View File

@@ -63,7 +63,7 @@ struct client_state {
unsigned char small_buffer[512]; unsigned char small_buffer[512];
void tm_at_cb(struct iscsi_context *iscsi _U_, int status _U_, void *command_data _U_, void *private_data) void tm_at_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client_state *clnt = (struct client_state *)private_data; struct client_state *clnt = (struct client_state *)private_data;
@@ -74,7 +74,7 @@ void tm_at_cb(struct iscsi_context *iscsi _U_, int status _U_, void *command_dat
} }
void synccache10_cb(struct iscsi_context *iscsi _U_, int status, void *command_data _U_, void *private_data _U_) void synccache10_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
printf("SYNCCACHE10 status:%d\n", status); printf("SYNCCACHE10 status:%d\n", status);
} }
@@ -103,7 +103,7 @@ void nop_out_cb(struct iscsi_context *iscsi, int status, void *command_data, voi
} }
void write10_1_cb(struct iscsi_context *iscsi _U_, int status, void *command_data, void *private_data _U_) void write10_1_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
@@ -123,7 +123,7 @@ void write10_1_cb(struct iscsi_context *iscsi _U_, int status, void *command_dat
exit(10); exit(10);
} }
void write10_cb(struct iscsi_context *iscsi _U_, int status, void *command_data, void *private_data _U_) void write10_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client_state *clnt = (struct client_state *)private_data; struct client_state *clnt = (struct client_state *)private_data;
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
@@ -482,7 +482,7 @@ void reportluns_cb(struct iscsi_context *iscsi, int status, void *command_data,
} }
void normallogin_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void normallogin_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
printf("Failed to log in to target : %s\n", iscsi_get_error(iscsi)); printf("Failed to log in to target : %s\n", iscsi_get_error(iscsi));
@@ -497,7 +497,7 @@ void normallogin_cb(struct iscsi_context *iscsi, int status, void *command_data
} }
void normalconnect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void normalconnect_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
printf("Connected to iscsi socket\n"); printf("Connected to iscsi socket\n");
@@ -517,7 +517,7 @@ void normalconnect_cb(struct iscsi_context *iscsi, int status, void *command_dat
void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client_state *clnt = (struct client_state *)private_data; struct client_state *clnt = (struct client_state *)private_data;
@@ -586,7 +586,7 @@ void discovery_cb(struct iscsi_context *iscsi, int status, void *command_data, v
} }
void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
printf("Failed to log in to target. : %s\n", iscsi_get_error(iscsi)); printf("Failed to log in to target. : %s\n", iscsi_get_error(iscsi));
@@ -601,7 +601,7 @@ void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_da
} }
void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
printf("Connected to iscsi socket status:0x%08x\n", status); printf("Connected to iscsi socket status:0x%08x\n", status);
@@ -619,7 +619,7 @@ void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_
} }
int main(int argc _U_, char *argv[] _U_) int main(int argc, char *argv[])
{ {
struct iscsi_context *iscsi; struct iscsi_context *iscsi;
struct pollfd pfd; struct pollfd pfd;

2
include/iscsi-private.h
View File

@@ -371,7 +371,7 @@ uint32_t iscsi_itt_post_increment(struct iscsi_context *iscsi);
void iscsi_timeout_scan(struct iscsi_context *iscsi); void iscsi_timeout_scan(struct iscsi_context *iscsi);
void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status, void iscsi_reconnect_cb(struct iscsi_context *iscsi, int status,
void *command_data, void *private_data); void *command_data, void *private_data);
struct iscsi_pdu *iscsi_tcp_new_pdu(struct iscsi_context *iscsi, size_t size); struct iscsi_pdu *iscsi_tcp_new_pdu(struct iscsi_context *iscsi, size_t size);

3
lib/Makefile.am
View File

@@ -22,8 +22,7 @@ endif
libiscsipriv_la_LDFLAGS = -no-undefined libiscsipriv_la_LDFLAGS = -no-undefined
libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include
"-D_U_=__attribute__((unused))"
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)

10
lib/connect.c
View File

@@ -46,7 +46,7 @@ struct connect_task {
}; };
static void static void
iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *private_data); void *private_data);
@@ -144,7 +144,7 @@ iscsi_testunitready_cb(struct iscsi_context *iscsi, int status,
} }
static void static void
iscsi_login_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, iscsi_login_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *private_data) void *private_data)
{ {
struct connect_task *ct = private_data; struct connect_task *ct = private_data;
@@ -184,7 +184,7 @@ iscsi_login_cb(struct iscsi_context *iscsi, int status, void *command_data _U_,
} }
static void static void
iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, iscsi_connect_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *private_data) void *private_data)
{ {
struct connect_task *ct = private_data; struct connect_task *ct = private_data;
@@ -276,8 +276,8 @@ void iscsi_defer_reconnect(struct iscsi_context *iscsi)
iscsi_cancel_pdus(iscsi); iscsi_cancel_pdus(iscsi);
} }
void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status, void iscsi_reconnect_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data _U_) void *command_data, void *private_data)
{ {
struct iscsi_context *old_iscsi; struct iscsi_context *old_iscsi;
int i; int i;

4
lib/iscsi-command.c
View File

@@ -40,7 +40,7 @@
static void static void
iscsi_scsi_response_cb(struct iscsi_context *iscsi, int status, iscsi_scsi_response_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct iscsi_scsi_cbdata *scsi_cbdata = struct iscsi_scsi_cbdata *scsi_cbdata =
(struct iscsi_scsi_cbdata *)private_data; (struct iscsi_scsi_cbdata *)private_data;
@@ -2433,7 +2433,7 @@ iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu
} }
struct scsi_iovector * struct scsi_iovector *
iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi _U_, struct iscsi_pdu *pdu) iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu)
{ {
if (pdu->scsi_cbdata.task->iovector_out.iov == NULL) { if (pdu->scsi_cbdata.task->iovector_out.iov == NULL) {
return NULL; return NULL;

6
lib/iser.c
View File

@@ -83,7 +83,7 @@ iscsi_iser_get_fd(struct iscsi_context *iscsi)
* Being used in QEMU iscsi block so we need compatability with TCP * Being used in QEMU iscsi block so we need compatability with TCP
*/ */
static int static int
iscsi_iser_which_events(struct iscsi_context *iscsi _U_) iscsi_iser_which_events(struct iscsi_context *iscsi)
{ {
/* iSER is waiting to events from CQ that are always POLLIN */ /* iSER is waiting to events from CQ that are always POLLIN */
return 1; return 1;
@@ -1401,8 +1401,8 @@ no_waitpdu:
* *
*/ */
static int static int
iser_snd_completion(struct iser_tx_desc *tx_desc _U_, iser_snd_completion(struct iser_tx_desc *tx_desc,
struct iser_conn *iser_conn _U_) struct iser_conn *iser_conn)
{ {
return 0; return 0;
} }

2
lib/login.c
View File

@@ -1435,7 +1435,7 @@ iscsi_logout_async(struct iscsi_context *iscsi, iscsi_command_cb cb,
int int
iscsi_process_logout_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu, iscsi_process_logout_reply(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
struct iscsi_in_pdu *in _U_) struct iscsi_in_pdu *in)
{ {
iscsi->is_loggedin = 0; iscsi->is_loggedin = 0;
ISCSI_LOG(iscsi, 2, "logout successful"); ISCSI_LOG(iscsi, 2, "logout successful");

2
lib/pdu.c
View File

@@ -330,7 +330,7 @@ int iscsi_process_target_nop_in(struct iscsi_context *iscsi,
} }
static void iscsi_reconnect_after_logout(struct iscsi_context *iscsi, int status, static void iscsi_reconnect_after_logout(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *opaque _U_) void *command_data, void *opaque)
{ {
if (status) { if (status) {
ISCSI_LOG(iscsi, 1, "logout failed: %s", iscsi_get_error(iscsi)); ISCSI_LOG(iscsi, 1, "logout failed: %s", iscsi_get_error(iscsi));

2
lib/scsi-lowlevel.c
View File

@@ -1246,7 +1246,7 @@ scsi_cdb_report_supported_opcodes(int rctd, int options, enum scsi_opcode opcode
* readcapacity10 datain structure * readcapacity10 datain structure
*/ */
static int static int
scsi_readcapacity10_datain_getfullsize(struct scsi_task *task _U_) scsi_readcapacity10_datain_getfullsize(struct scsi_task *task)
{ {
return 8; return 8;
} }

4
lib/socket.c
View File

@@ -1069,7 +1069,7 @@ void iscsi_set_tcp_keepintvl(struct iscsi_context *iscsi, int value)
ISCSI_LOG(iscsi, 2, "TCP_KEEPINTVL will be set to %d on next socket creation",value); ISCSI_LOG(iscsi, 2, "TCP_KEEPINTVL will be set to %d on next socket creation",value);
} }
int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle _U_, int count _U_, int interval _U_) int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle, int count, int interval)
{ {
#ifdef SO_KEEPALIVE #ifdef SO_KEEPALIVE
int value = 1; int value = 1;
@@ -1104,7 +1104,7 @@ int iscsi_set_tcp_keepalive(struct iscsi_context *iscsi, int idle _U_, int count
return 0; return 0;
} }
void iscsi_set_bind_interfaces(struct iscsi_context *iscsi, char * interfaces _U_) void iscsi_set_bind_interfaces(struct iscsi_context *iscsi, char * interfaces)
{ {
#if __linux #if __linux
strncpy(iscsi->bind_interfaces,interfaces,MAX_STRING_SIZE); strncpy(iscsi->bind_interfaces,interfaces,MAX_STRING_SIZE);

10
lib/sync.c
View File

@@ -82,8 +82,8 @@ event_loop(struct iscsi_context *iscsi, struct iscsi_sync_state *state)
* Synchronous iSCSI commands * Synchronous iSCSI commands
*/ */
static void static void
iscsi_sync_cb(struct iscsi_context *iscsi _U_, int status, iscsi_sync_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct iscsi_sync_state *state = private_data; struct iscsi_sync_state *state = private_data;
@@ -340,7 +340,7 @@ iscsi_task_mgmt_target_cold_reset_sync(struct iscsi_context *iscsi)
* Synchronous SCSI commands * Synchronous SCSI commands
*/ */
static void static void
scsi_sync_cb(struct iscsi_context *iscsi _U_, int status, void *command_data, scsi_sync_cb(struct iscsi_context *iscsi, int status, void *command_data,
void *private_data) void *private_data)
{ {
struct scsi_task *task = command_data; struct scsi_task *task = command_data;
@@ -1820,7 +1820,7 @@ iscsi_modesense10_sync(struct iscsi_context *iscsi, int lun, int llbaa, int dbd,
return state.task; return state.task;
} }
void iscsi_free_discovery_data(struct iscsi_context *iscsi _U_, void iscsi_free_discovery_data(struct iscsi_context *iscsi,
struct iscsi_discovery_address *da) struct iscsi_discovery_address *da)
{ {
while (da) { while (da) {
@@ -1840,7 +1840,7 @@ void iscsi_free_discovery_data(struct iscsi_context *iscsi _U_,
} }
static void static void
iscsi_discovery_cb(struct iscsi_context *iscsi _U_, int status, iscsi_discovery_cb(struct iscsi_context *iscsi, int status,
void *command_data, void *private_data) void *command_data, void *private_data)
{ {
struct iscsi_sync_state *state = private_data; struct iscsi_sync_state *state = private_data;

3
test-tool/Makefile.am
View File

@@ -1,5 +1,4 @@
AM_CPPFLAGS=-I. -I${srcdir}/../include \ AM_CPPFLAGS=-I. -I${srcdir}/../include
"-D_U_=__attribute__((unused)) "
AM_CFLAGS=$(WARN_CFLAGS) AM_CFLAGS=$(WARN_CFLAGS)
AM_LDFLAGS=-no-undefined AM_LDFLAGS=-no-undefined
LIBS = ../lib/libiscsipriv.la LIBS = ../lib/libiscsipriv.la

2
test-tool/test_iscsi_nop_simple.c
View File

@@ -57,7 +57,7 @@ test_iscsi_nop_txrx(struct test_iscsi_nop_state *state)
} }
static void static void
test_iscsi_nop_cb(struct iscsi_context *iscsi _U_, int status, test_iscsi_nop_cb(struct iscsi_context *iscsi, int status,
void *command_data, void *private_data) void *command_data, void *private_data)
{ {
struct test_iscsi_nop_state *state = private_data; struct test_iscsi_nop_state *state = private_data;

4
test-tool/test_iscsi_sendtargets.c
View File

@@ -59,8 +59,8 @@ test_iscsi_sendtargets_txrx(struct test_iscsi_sendtargets_state *state)
} }
static void static void
test_iscsi_sendtargets_cb(struct iscsi_context *iscsi _U_, int status, test_iscsi_sendtargets_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct test_iscsi_sendtargets_state *state = private_data; struct test_iscsi_sendtargets_state *state = private_data;

4
test-tool/test_sanitize_reset.c
View File

@@ -26,8 +26,8 @@
#include "scsi-lowlevel.h" #include "scsi-lowlevel.h"
#include "iscsi-test-cu.h" #include "iscsi-test-cu.h"
static void sanitize_cb(struct iscsi_context *iscsi _U_, int status _U_, static void sanitize_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data _U_) void *command_data, void *private_data)
{ {
} }

2
tests/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" AM_CPPFLAGS = -I${srcdir}/../include
AM_CFLAGS = $(WARN_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS)
AM_LDFLAGS = -no-undefined AM_LDFLAGS = -no-undefined
LIBS = ../lib/libiscsi.la LIBS = ../lib/libiscsi.la

4
tests/prog_header_digest.c
View File

@@ -82,8 +82,8 @@ void event_loop(struct iscsi_context *iscsi, struct client_state *state,
} }
} }
void tur_cb(struct iscsi_context *iscsi _U_, int status, void tur_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;

4
tests/prog_noop_reply.c
View File

@@ -82,8 +82,8 @@ void event_loop(struct iscsi_context *iscsi, struct client_state *state,
} }
} }
void tur_cb(struct iscsi_context *iscsi _U_, int status, void tur_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;

4
tests/prog_read_all_pdus.c
View File

@@ -68,8 +68,8 @@ void print_help(void)
fprintf(stderr, " \"ipv6-address\" [fce0::1]\n"); fprintf(stderr, " \"ipv6-address\" [fce0::1]\n");
} }
void tur_cb(struct iscsi_context *iscsi _U_, int status _U_, void tur_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
int *count = (int *)private_data; int *count = (int *)private_data;

2
tests/prog_reconnect.c
View File

@@ -73,7 +73,7 @@ void event_loop(struct iscsi_context *iscsi, struct client_state *state)
} }
void logout_cb(struct iscsi_context *iscsi, int status, void logout_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;

2
tests/prog_reconnect_timeout.c
View File

@@ -83,7 +83,7 @@ void event_loop(struct iscsi_context *iscsi, struct client_state *state)
} }
void logout_cb(struct iscsi_context *iscsi, int status, void logout_cb(struct iscsi_context *iscsi, int status,
void *command_data _U_, void *private_data) void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;

4
tests/prog_timeout.c
View File

@@ -72,7 +72,7 @@ void print_help(void)
fprintf(stderr, " \"ipv6-address\" [fce0::1]\n"); fprintf(stderr, " \"ipv6-address\" [fce0::1]\n");
} }
void tur_cb(struct iscsi_context *iscsi _U_, int status, void *command_data _U_, void *private_data) void tur_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
uint32_t *i = private_data; uint32_t *i = private_data;
@@ -86,7 +86,7 @@ void tur_cb(struct iscsi_context *iscsi _U_, int status, void *command_data _U_,
} }
} }
void logout_cb(struct iscsi_context *iscsi _U_, int status, void *command_data _U_, void *private_data) void logout_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
uint32_t *i = private_data; uint32_t *i = private_data;

2
utils/Makefile.am
View File

@@ -1,4 +1,4 @@
AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" AM_CPPFLAGS = -I${srcdir}/../include
AM_CFLAGS = $(WARN_CFLAGS) AM_CFLAGS = $(WARN_CFLAGS)
AM_LDFLAGS = -no-undefined AM_LDFLAGS = -no-undefined
LIBS = ../lib/libiscsi.la LIBS = ../lib/libiscsi.la

6
utils/iscsi-ls.c
View File

@@ -234,7 +234,7 @@ void list_luns(struct client_state *clnt, const char *target, const char *portal
void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogout_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client_state *state = (struct client_state *)private_data; struct client_state *state = (struct client_state *)private_data;
@@ -287,7 +287,7 @@ void discovery_cb(struct iscsi_context *iscsi, int status, void *command_data, v
} }
void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi));
@@ -300,7 +300,7 @@ void discoverylogin_cb(struct iscsi_context *iscsi, int status, void *command_da
} }
} }
void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data _U_, void *private_data) void discoveryconnect_cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
if (status != 0) { if (status != 0) {
fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi)); fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi));

2
utils/iscsi-perf.c
View File

@@ -126,7 +126,7 @@ void progress(struct client *client) {
client->last_bytes = client->bytes; client->last_bytes = client->bytes;
} }
void cb(struct iscsi_context *iscsi _U_, int status, void *command_data, void *private_data) void cb(struct iscsi_context *iscsi, int status, void *command_data, void *private_data)
{ {
struct client *client = (struct client *)private_data; struct client *client = (struct client *)private_data;
struct scsi_task *task = command_data, *task2 = NULL; struct scsi_task *task = command_data, *task2 = NULL;

8
win32/iscsi-ls/iscsi-ls.vcxproj
View File

@@ -84,7 +84,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -103,7 +103,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -124,7 +124,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>
@@ -143,7 +143,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;_U_=;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<Link> <Link>

8
win32/libiscsi/libiscsi.vcxproj
View File

@@ -88,7 +88,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;_USE_32BIT_TIME_T;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -111,7 +111,7 @@
</PrecompiledHeader> </PrecompiledHeader>
<WarningLevel>Level3</WarningLevel> <WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories>
<CompileAs>Default</CompileAs> <CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
@@ -136,7 +136,7 @@
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;_USE_32BIT_TIME_T;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_USE_32BIT_TIME_T;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
</ClCompile> </ClCompile>
@@ -161,7 +161,7 @@
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking> <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions> <IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_U_=;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;__STDC_CONSTANT_MACROS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\..\include;..\..\.;..\..\win32;..\..\lib</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4996</DisableSpecificWarnings> <DisableSpecificWarnings>4996</DisableSpecificWarnings>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>