Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libiscsi for openSUSE:Factory checked in at 2021-06-27 18:58:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libiscsi (Old) and /work/SRC/openSUSE:Factory/.libiscsi.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libiscsi" Sun Jun 27 18:58:12 2021 rev:18 rq:901639 version:1.19.0+git.20210523 Changes: -------- --- /work/SRC/openSUSE:Factory/libiscsi/libiscsi.changes 2021-04-24 23:06:43.107188232 +0200 +++ /work/SRC/openSUSE:Factory/.libiscsi.new.2625/libiscsi.changes 2021-06-27 18:58:24.996223619 +0200 @@ -1,0 +2,13 @@ +Thu Jun 24 08:10:40 UTC 2021 - Martin Pluskal <[email protected]> + +- Update to version 1.19.0+git.20210523: + * Port to MinGW + * win32/win32_compat.c: Reformat this file + * Enable -Wno-unused-parameter + * Use __attribute__((format(printf, ...))) directly + * build: Add -no-undefined where missing + * build: Correct usage of LIBADD and LDADD + * build: Remove bogus LDADD variables + * Add header <strings.h> for strncasecmp + +------------------------------------------------------------------- Old: ---- libiscsi-1.19.0+git.20210208.obscpio New: ---- libiscsi-1.19.0+git.20210523.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libiscsi.spec ++++++ --- /var/tmp/diff_new_pack.EAqRGi/_old 2021-06-27 18:58:25.656224486 +0200 +++ /var/tmp/diff_new_pack.EAqRGi/_new 2021-06-27 18:58:25.656224486 +0200 @@ -18,7 +18,7 @@ %define sover 9 Name: libiscsi -Version: 1.19.0+git.20210208 +Version: 1.19.0+git.20210523 Release: 0 Summary: iSCSI client library and utilities License: GPL-2.0-only AND LGPL-2.1-only ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.EAqRGi/_old 2021-06-27 18:58:25.692224533 +0200 +++ /var/tmp/diff_new_pack.EAqRGi/_new 2021-06-27 18:58:25.692224533 +0200 @@ -3,4 +3,4 @@ <param name="url">[email protected]:sahlberg/libiscsi.git</param> <param name="changesrevision">e6bcdf5fdbf39729399c4f0914661ca1055107a1</param></service><service name="tar_scm"> <param name="url">https://github.com/sahlberg/libiscsi.git</param> - <param name="changesrevision">f87a5adaa08b2e77545aa404b0734544ed62e714</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">70759869ff857ae8c38ff58254265c6e43f9585e</param></service></servicedata> \ No newline at end of file ++++++ libiscsi-1.19.0+git.20210208.obscpio -> libiscsi-1.19.0+git.20210523.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/.gitignore new/libiscsi-1.19.0+git.20210523/.gitignore --- old/libiscsi-1.19.0+git.20210208/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/.gitignore 2021-05-23 22:23:52.000000000 +0200 @@ -0,0 +1,54 @@ +/autom4te.cache/ +/depcomp +/aclocal.m4 +/missing +/m4/ +/config.guess +/config.sub +/install-sh +/configure +/config.h.in +/Makefile.in +/Makefile +.deps +.libs +/stamp-h1 +*.o +*.lo +*.la +*.so +bin +/config.h +/config.log +/config.status +.dirstamp +/libtool +/ltmain.sh +libiscsi-*.tar.gz +TAGS +/ar-lib +/compile +/doc/Makefile.in +/doc/Makefile +/examples/Makefile.in +/examples/Makefile +/examples/iscsi-dd +/examples/iscsiclient +/examples/ld_iscsi.so +/lib/Makefile.in +/lib/Makefile +/test-tool/Makefile.in +/test-tool/Makefile +/test-tool/iscsi-test-cu +/tests/Makefile.in +/tests/Makefile +/utils/Makefile.in +/utils/Makefile +/utils/iscsi-inq +/utils/iscsi-ls +/utils/iscsi-perf +/utils/iscsi-readcapacity16 +/utils/iscsi-swp +/libiscsi.pc +/.cproject +/.project diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/Makefile.am new/libiscsi-1.19.0+git.20210523/Makefile.am --- old/libiscsi-1.19.0+git.20210208/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -12,10 +12,8 @@ ACLOCAL_AMFLAGS =-I m4 AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +AM_CPPFLAGS=-I. -I$(srcdir)/include AM_CFLAGS=$(WARN_CFLAGS) -LDADD = lib/libiscsi.la EXTRA_DIST = autogen.sh COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt \ packaging/RPM/libiscsi.spec.in packaging/RPM/makerpms.sh \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/aros/Makefile.AROS new/libiscsi-1.19.0+git.20210523/aros/Makefile.AROS --- old/libiscsi-1.19.0+git.20210208/aros/Makefile.AROS 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/aros/Makefile.AROS 2021-05-23 22:23:52.000000000 +0200 @@ -1,6 +1,6 @@ AR=ar 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/aros/iscsi-ls.c new/libiscsi-1.19.0+git.20210523/aros/iscsi-ls.c --- old/libiscsi-1.19.0+git.20210208/aros/iscsi-ls.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/aros/iscsi-ls.c 2021-05-23 22:23:52.000000000 +0200 @@ -219,7 +219,7 @@ -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; @@ -259,7 +259,7 @@ } -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) { fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi)); @@ -272,7 +272,7 @@ } } -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) { fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/configure.ac new/libiscsi-1.19.0+git.20210523/configure.ac --- old/libiscsi-1.19.0+git.20210208/configure.ac 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/configure.ac 2021-05-23 22:23:52.000000000 +0200 @@ -30,6 +30,7 @@ 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="$WARN_CFLAGS -Wno-unknown-warning-option -Wno-stringop-truncation" + WARN_CFLAGS="$WARN_CFLAGS -Wno-unused-parameter" if test "x$enable_werror" != "xno"; then WARN_CFLAGS="$WARN_CFLAGS -Werror" fi @@ -76,6 +77,9 @@ AC_CHECK_LIB([gcrypt], [gcry_control]) AM_CONDITIONAL([HAVE_LIBGCRYPT], [test $ac_cv_lib_gcrypt_gcry_control = yes]) +# For MinGW. +AC_CHECK_LIB([ws2_32], [gethostbyname]) + AC_CACHE_CHECK([for sin_len in sock],libiscsi_cv_HAVE_SOCK_SIN_LEN,[ AC_TRY_COMPILE([#include <sys/types.h> #include <sys/socket.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/examples/Makefile.am new/libiscsi-1.19.0+git.20210523/examples/Makefile.am --- old/libiscsi-1.19.0+git.20210208/examples/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/examples/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -1,6 +1,6 @@ -AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +AM_CPPFLAGS=-I. -I${srcdir}/../include AM_CFLAGS=$(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +AM_LDFLAGS=-no-undefined +LIBS=../lib/libiscsi.la noinst_PROGRAMS = iscsiclient iscsi-dd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/examples/iscsi-dd.c new/libiscsi-1.19.0+git.20210523/examples/iscsi-dd.c --- old/libiscsi-1.19.0+git.20210208/examples/iscsi-dd.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/examples/iscsi-dd.c 2021-05-23 22:23:52.000000000 +0200 @@ -102,7 +102,7 @@ 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 scsi_task *task = command_data; @@ -276,7 +276,7 @@ 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 scsi_task *task = command_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/examples/iscsiclient.c new/libiscsi-1.19.0+git.20210523/examples/iscsiclient.c --- old/libiscsi-1.19.0+git.20210208/examples/iscsiclient.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/examples/iscsiclient.c 2021-05-23 22:23:52.000000000 +0200 @@ -63,7 +63,7 @@ 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; @@ -74,7 +74,7 @@ } -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); } @@ -103,7 +103,7 @@ } -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; @@ -123,7 +123,7 @@ 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 scsi_task *task = command_data; @@ -482,7 +482,7 @@ } -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) { printf("Failed to log in to target : %s\n", iscsi_get_error(iscsi)); @@ -497,7 +497,7 @@ } -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"); @@ -517,7 +517,7 @@ -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; @@ -586,7 +586,7 @@ } -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) { printf("Failed to log in to target. : %s\n", iscsi_get_error(iscsi)); @@ -601,7 +601,7 @@ } -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); @@ -619,7 +619,7 @@ } -int main(int argc _U_, char *argv[] _U_) +int main(int argc, char *argv[]) { struct iscsi_context *iscsi; struct pollfd pfd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/include/iscsi-private.h new/libiscsi-1.19.0+git.20210523/include/iscsi-private.h --- old/libiscsi-1.19.0+git.20210208/include/iscsi-private.h 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/include/iscsi-private.h 2021-05-23 22:23:52.000000000 +0200 @@ -330,13 +330,8 @@ struct iscsi_in_pdu *in); int iscsi_send_target_nop_out(struct iscsi_context *iscsi, uint32_t ttt, uint32_t lun); -#if defined(_WIN32) -void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string, - ...); -#else void iscsi_set_error(struct iscsi_context *iscsi, const char *error_string, ...) __attribute__((format(printf, 2, 3))); -#endif struct scsi_iovector *iscsi_get_scsi_task_iovector_in(struct iscsi_context *iscsi, struct iscsi_in_pdu *in); struct scsi_iovector *iscsi_get_scsi_task_iovector_out(struct iscsi_context *iscsi, struct iscsi_pdu *pdu); @@ -376,7 +371,7 @@ 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); struct iscsi_pdu *iscsi_tcp_new_pdu(struct iscsi_context *iscsi, size_t size); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/Makefile.am new/libiscsi-1.19.0+git.20210523/lib/Makefile.am --- old/libiscsi-1.19.0+git.20210208/lib/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -17,12 +17,12 @@ endif if HAVE_LINUX_ISER -libiscsipriv_la_LDFLAGS = -libverbs -lrdmacm -lpthread +libiscsipriv_la_LIBADD = -libverbs -lrdmacm -lpthread endif -libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ - "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +libiscsipriv_la_LDFLAGS = -no-undefined + +libiscsipriv_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include AM_CFLAGS=$(WARN_CFLAGS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/connect.c new/libiscsi-1.19.0+git.20210523/lib/connect.c --- old/libiscsi-1.19.0+git.20210208/lib/connect.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/connect.c 2021-05-23 22:23:52.000000000 +0200 @@ -46,7 +46,7 @@ }; 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); @@ -144,7 +144,7 @@ } 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) { struct connect_task *ct = private_data; @@ -184,7 +184,7 @@ } 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) { struct connect_task *ct = private_data; @@ -276,8 +276,8 @@ iscsi_cancel_pdus(iscsi); } -void iscsi_reconnect_cb(struct iscsi_context *iscsi _U_, int status, - void *command_data _U_, void *private_data _U_) +void iscsi_reconnect_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *private_data) { struct iscsi_context *old_iscsi; int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/init.c new/libiscsi-1.19.0+git.20210523/lib/init.c --- old/libiscsi-1.19.0+git.20210208/lib/init.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/init.c 2021-05-23 22:23:52.000000000 +0200 @@ -293,7 +293,8 @@ while (iscsi->smalloc_size < required) { iscsi->smalloc_size <<= 1; } - ISCSI_LOG(iscsi,5,"small allocation size is %zu byte", iscsi->smalloc_size); + ISCSI_LOG(iscsi, 5, "small allocation size is %u byte", + (uint32_t)iscsi->smalloc_size); ca = getenv("LIBISCSI_CACHE_ALLOCATIONS"); if (!ca || atoi(ca) != 0) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/iscsi-command.c new/libiscsi-1.19.0+git.20210523/lib/iscsi-command.c --- old/libiscsi-1.19.0+git.20210208/lib/iscsi-command.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/iscsi-command.c 2021-05-23 22:23:52.000000000 +0200 @@ -40,7 +40,7 @@ static void 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 *)private_data; @@ -2433,7 +2433,7 @@ } 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) { return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/iser.c new/libiscsi-1.19.0+git.20210523/lib/iser.c --- old/libiscsi-1.19.0+git.20210208/lib/iser.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/iser.c 2021-05-23 22:23:52.000000000 +0200 @@ -83,7 +83,7 @@ * Being used in QEMU iscsi block so we need compatability with TCP */ 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 */ return 1; @@ -1401,8 +1401,8 @@ * */ static int -iser_snd_completion(struct iser_tx_desc *tx_desc _U_, - struct iser_conn *iser_conn _U_) +iser_snd_completion(struct iser_tx_desc *tx_desc, + struct iser_conn *iser_conn) { return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/login.c new/libiscsi-1.19.0+git.20210523/lib/login.c --- old/libiscsi-1.19.0+git.20210208/lib/login.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/login.c 2021-05-23 22:23:52.000000000 +0200 @@ -1435,7 +1435,7 @@ int 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_LOG(iscsi, 2, "logout successful"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/pdu.c new/libiscsi-1.19.0+git.20210523/lib/pdu.c --- old/libiscsi-1.19.0+git.20210208/lib/pdu.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/pdu.c 2021-05-23 22:23:52.000000000 +0200 @@ -330,7 +330,7 @@ } 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) { ISCSI_LOG(iscsi, 1, "logout failed: %s", iscsi_get_error(iscsi)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/scsi-lowlevel.c new/libiscsi-1.19.0+git.20210523/lib/scsi-lowlevel.c --- old/libiscsi-1.19.0+git.20210208/lib/scsi-lowlevel.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/scsi-lowlevel.c 2021-05-23 22:23:52.000000000 +0200 @@ -1246,7 +1246,7 @@ * readcapacity10 datain structure */ static int -scsi_readcapacity10_datain_getfullsize(struct scsi_task *task _U_) +scsi_readcapacity10_datain_getfullsize(struct scsi_task *task) { return 8; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/socket.c new/libiscsi-1.19.0+git.20210523/lib/socket.c --- old/libiscsi-1.19.0+git.20210208/lib/socket.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/socket.c 2021-05-23 22:23:52.000000000 +0200 @@ -630,7 +630,8 @@ * no need to limit the read to what is available in the socket */ count = hdr_size - in->hdr_pos; - count = recv(iscsi->fd, &in->hdr[in->hdr_pos], count, 0); + count = recv(iscsi->fd, (void *)&in->hdr[in->hdr_pos], + count, 0); if (count == 0) { /* remote side has closed the socket. */ return -1; @@ -681,7 +682,7 @@ } buf = &in->data[in->data_pos]; } - count = recv(iscsi->fd, buf, count, 0); + count = recv(iscsi->fd, (void *)buf, count, 0); } if (count == 0) { /* remote side has closed the socket. */ @@ -805,7 +806,8 @@ /* Write header and any immediate data */ if (pdu->outdata_written < pdu->outdata.size) { count = send(iscsi->fd, - pdu->outdata.data + pdu->outdata_written, + (void *)(pdu->outdata.data + + pdu->outdata_written), pdu->outdata.size - pdu->outdata_written, socket_flags); if (count == -1) { @@ -1069,7 +1071,7 @@ 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 int value = 1; @@ -1104,7 +1106,7 @@ 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 strncpy(iscsi->bind_interfaces,interfaces,MAX_STRING_SIZE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/lib/sync.c new/libiscsi-1.19.0+git.20210523/lib/sync.c --- old/libiscsi-1.19.0+git.20210208/lib/sync.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/lib/sync.c 2021-05-23 22:23:52.000000000 +0200 @@ -82,8 +82,8 @@ * Synchronous iSCSI commands */ static void -iscsi_sync_cb(struct iscsi_context *iscsi _U_, int status, - void *command_data _U_, void *private_data) +iscsi_sync_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *private_data) { struct iscsi_sync_state *state = private_data; @@ -340,7 +340,7 @@ * Synchronous SCSI commands */ 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) { struct scsi_task *task = command_data; @@ -1820,7 +1820,7 @@ 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) { while (da) { @@ -1840,7 +1840,7 @@ } 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) { struct iscsi_sync_state *state = private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/packaging/RPM/.gitignore new/libiscsi-1.19.0+git.20210523/packaging/RPM/.gitignore --- old/libiscsi-1.19.0+git.20210208/packaging/RPM/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/packaging/RPM/.gitignore 2021-05-23 22:23:52.000000000 +0200 @@ -0,0 +1 @@ +/*.spec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/test-tool/Makefile.am new/libiscsi-1.19.0+git.20210523/test-tool/Makefile.am --- old/libiscsi-1.19.0+git.20210208/test-tool/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/test-tool/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -1,8 +1,7 @@ -AM_CPPFLAGS=-I. -I${srcdir}/../include \ - "-D_U_=__attribute__((unused)) " \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +AM_CPPFLAGS=-I. -I${srcdir}/../include AM_CFLAGS=$(WARN_CFLAGS) -LDADD = ../lib/libiscsipriv.la +AM_LDFLAGS=-no-undefined +LIBS = ../lib/libiscsipriv.la EXTRA_DIST = README @@ -13,7 +12,7 @@ # libiscsi test tool using cunit if ISCSITEST bin_PROGRAMS = iscsi-test-cu -iscsi_test_cu_LDFLAGS = -ldl -lcunit +iscsi_test_cu_LDADD = -ldl -lcunit iscsi_test_cu_SOURCES = iscsi-test-cu.c \ iscsi-support.c \ iscsi-multipath.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/test-tool/iscsi-support.h new/libiscsi-1.19.0+git.20210523/test-tool/iscsi-support.h --- old/libiscsi-1.19.0+git.20210208/test-tool/iscsi-support.h 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/test-tool/iscsi-support.h 2021-05-23 22:23:52.000000000 +0200 @@ -65,7 +65,8 @@ #define LOG_SILENT 0 #define LOG_NORMAL 1 #define LOG_VERBOSE 2 -void logging(int level, const char *format, ...) _R_(2,3); +void logging(int level, const char *format, ...) +__attribute__((format(printf, 2, 3))); /* * define special flags for logging a blank line, so compiler diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/test-tool/test_iscsi_nop_simple.c new/libiscsi-1.19.0+git.20210523/test-tool/test_iscsi_nop_simple.c --- old/libiscsi-1.19.0+git.20210208/test-tool/test_iscsi_nop_simple.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/test-tool/test_iscsi_nop_simple.c 2021-05-23 22:23:52.000000000 +0200 @@ -57,7 +57,7 @@ } 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) { struct test_iscsi_nop_state *state = private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/test-tool/test_iscsi_sendtargets.c new/libiscsi-1.19.0+git.20210523/test-tool/test_iscsi_sendtargets.c --- old/libiscsi-1.19.0+git.20210208/test-tool/test_iscsi_sendtargets.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/test-tool/test_iscsi_sendtargets.c 2021-05-23 22:23:52.000000000 +0200 @@ -59,8 +59,8 @@ } static void -test_iscsi_sendtargets_cb(struct iscsi_context *iscsi _U_, int status, - void *command_data _U_, void *private_data) +test_iscsi_sendtargets_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *private_data) { struct test_iscsi_sendtargets_state *state = private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/test-tool/test_sanitize_reset.c new/libiscsi-1.19.0+git.20210523/test-tool/test_sanitize_reset.c --- old/libiscsi-1.19.0+git.20210208/test-tool/test_sanitize_reset.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/test-tool/test_sanitize_reset.c 2021-05-23 22:23:52.000000000 +0200 @@ -26,8 +26,8 @@ #include "scsi-lowlevel.h" #include "iscsi-test-cu.h" -static void sanitize_cb(struct iscsi_context *iscsi _U_, int status _U_, - void *command_data _U_, void *private_data _U_) +static void sanitize_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *private_data) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/.gitignore new/libiscsi-1.19.0+git.20210523/tests/.gitignore --- old/libiscsi-1.19.0+git.20210208/tests/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/.gitignore 2021-05-23 22:23:52.000000000 +0200 @@ -0,0 +1,7 @@ +/prog_header_digest +/prog_noop_reply +/prog_read_all_pdus +/prog_readwrite_iov +/prog_reconnect +/prog_reconnect_timeout +/prog_timeout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/Makefile.am new/libiscsi-1.19.0+git.20210523/tests/Makefile.am --- old/libiscsi-1.19.0+git.20210208/tests/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +AM_CPPFLAGS = -I${srcdir}/../include AM_CFLAGS = $(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +AM_LDFLAGS = -no-undefined +LIBS = ../lib/libiscsi.la noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ prog_readwrite_iov prog_timeout prog_read_all_pdus \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_header_digest.c new/libiscsi-1.19.0+git.20210523/tests/prog_header_digest.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_header_digest.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_header_digest.c 2021-05-23 22:23:52.000000000 +0200 @@ -82,8 +82,8 @@ } } -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) { struct client_state *state = (struct client_state *)private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_noop_reply.c new/libiscsi-1.19.0+git.20210523/tests/prog_noop_reply.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_noop_reply.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_noop_reply.c 2021-05-23 22:23:52.000000000 +0200 @@ -82,8 +82,8 @@ } } -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) { struct client_state *state = (struct client_state *)private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_read_all_pdus.c new/libiscsi-1.19.0+git.20210523/tests/prog_read_all_pdus.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_read_all_pdus.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_read_all_pdus.c 2021-05-23 22:23:52.000000000 +0200 @@ -68,8 +68,8 @@ fprintf(stderr, " \"ipv6-address\" [fce0::1]\n"); } -void tur_cb(struct iscsi_context *iscsi _U_, int status _U_, - void *command_data _U_, void *private_data) +void tur_cb(struct iscsi_context *iscsi, int status, + void *command_data, void *private_data) { int *count = (int *)private_data; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_reconnect.c new/libiscsi-1.19.0+git.20210523/tests/prog_reconnect.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_reconnect.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_reconnect.c 2021-05-23 22:23:52.000000000 +0200 @@ -73,7 +73,7 @@ } 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_reconnect_timeout.c new/libiscsi-1.19.0+git.20210523/tests/prog_reconnect_timeout.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_reconnect_timeout.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_reconnect_timeout.c 2021-05-23 22:23:52.000000000 +0200 @@ -83,7 +83,7 @@ } 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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/tests/prog_timeout.c new/libiscsi-1.19.0+git.20210523/tests/prog_timeout.c --- old/libiscsi-1.19.0+git.20210208/tests/prog_timeout.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/tests/prog_timeout.c 2021-05-23 22:23:52.000000000 +0200 @@ -72,7 +72,7 @@ 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; @@ -86,7 +86,7 @@ } } -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; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/utils/Makefile.am new/libiscsi-1.19.0+git.20210523/utils/Makefile.am --- old/libiscsi-1.19.0+git.20210208/utils/Makefile.am 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/utils/Makefile.am 2021-05-23 22:23:52.000000000 +0200 @@ -1,7 +1,7 @@ -AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" +AM_CPPFLAGS = -I${srcdir}/../include AM_CFLAGS = $(WARN_CFLAGS) -LDADD = ../lib/libiscsi.la +AM_LDFLAGS = -no-undefined +LIBS = ../lib/libiscsi.la bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ iscsi-swp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/utils/iscsi-ls.c new/libiscsi-1.19.0+git.20210523/utils/iscsi-ls.c --- old/libiscsi-1.19.0+git.20210208/utils/iscsi-ls.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/utils/iscsi-ls.c 2021-05-23 22:23:52.000000000 +0200 @@ -37,6 +37,7 @@ #include <stdlib.h> #include <stdint.h> #include <string.h> +#include <strings.h> #include "iscsi.h" #include "scsi-lowlevel.h" @@ -233,7 +234,7 @@ -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; @@ -286,7 +287,7 @@ } -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) { fprintf(stderr, "Login failed. %s\n", iscsi_get_error(iscsi)); @@ -299,7 +300,7 @@ } } -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) { fprintf(stderr, "discoveryconnect_cb: connection failed : %s\n", iscsi_get_error(iscsi)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/utils/iscsi-perf.c new/libiscsi-1.19.0+git.20210523/utils/iscsi-perf.c --- old/libiscsi-1.19.0+git.20210208/utils/iscsi-perf.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/utils/iscsi-perf.c 2021-05-23 22:23:52.000000000 +0200 @@ -126,7 +126,7 @@ 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 scsi_task *task = command_data, *task2 = NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/win32/iscsi-ls/iscsi-ls.vcxproj new/libiscsi-1.19.0+git.20210523/win32/iscsi-ls/iscsi-ls.vcxproj --- old/libiscsi-1.19.0+git.20210208/win32/iscsi-ls/iscsi-ls.vcxproj 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/win32/iscsi-ls/iscsi-ls.vcxproj 2021-05-23 22:23:52.000000000 +0200 @@ -84,7 +84,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <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> </ClCompile> <Link> @@ -103,7 +103,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <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> </ClCompile> <Link> @@ -124,7 +124,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <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> </ClCompile> <Link> @@ -143,7 +143,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <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> </ClCompile> <Link> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/win32/libiscsi/libiscsi.vcxproj new/libiscsi-1.19.0+git.20210523/win32/libiscsi/libiscsi.vcxproj --- old/libiscsi-1.19.0+git.20210208/win32/libiscsi/libiscsi.vcxproj 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/win32/libiscsi/libiscsi.vcxproj 2021-05-23 22:23:52.000000000 +0200 @@ -88,7 +88,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <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> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4996</DisableSpecificWarnings> @@ -111,7 +111,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <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> <CompileAs>Default</CompileAs> <DisableSpecificWarnings>4996</DisableSpecificWarnings> @@ -136,7 +136,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <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> <DisableSpecificWarnings>4996</DisableSpecificWarnings> </ClCompile> @@ -161,7 +161,7 @@ <Optimization>Full</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <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> <DisableSpecificWarnings>4996</DisableSpecificWarnings> <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/win32/win32_compat.c new/libiscsi-1.19.0+git.20210523/win32/win32_compat.c --- old/libiscsi-1.19.0+git.20210208/win32/win32_compat.c 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/win32/win32_compat.c 2021-05-23 22:23:52.000000000 +0200 @@ -21,11 +21,6 @@ THE SOFTWARE. */ -#ifndef _WIN32 - -static int dummy ATTRIBUTE((unused)); - -#else #include "win32_compat.h" #include <errno.h> #include <stdio.h> @@ -46,156 +41,142 @@ /* Windows needs this header file for the implementation of inet_aton() */ #include <ctype.h> -int win32_inet_pton(int af, const char * src, void * dst) +int win32_inet_pton(int af, const char *src, void *dst) { - struct sockaddr_in sa; - int len = sizeof(SOCKADDR); - int ret = -1; - int strLen = strlen(src) + 1; + struct sockaddr_in sa; + int len = sizeof(SOCKADDR); + int ret = -1; + int strLen = strlen(src) + 1; #ifdef UNICODE - wchar_t *srcNonConst = (wchar_t *)malloc(strLen*sizeof(wchar_t)); - memset(srcNonConst, 0, strLen); - MultiByteToWideChar(CP_ACP, 0, src, -1, srcNonConst, strLen); + wchar_t *srcNonConst = (wchar_t *)malloc(strLen * sizeof(wchar_t)); + memset(srcNonConst, 0, strLen); + MultiByteToWideChar(CP_ACP, 0, src, -1, srcNonConst, strLen); #else - char *srcNonConst = (char *)malloc(strLen); - memset(srcNonConst, 0, strLen); - strncpy(srcNonConst, src, strLen); -#endif - - if( WSAStringToAddress(srcNonConst,af,NULL,(LPSOCKADDR)&sa,&len) == 0 ) - { - ret = 1; - } - else - { - if( WSAGetLastError() == WSAEINVAL ) - { - ret = -1; - } - } - free(srcNonConst); - memcpy(dst, &sa.sin_addr, sizeof(struct in_addr)); - return ret; + char *srcNonConst = (char *)malloc(strLen); + memset(srcNonConst, 0, strLen); + strncpy(srcNonConst, src, strLen); +#endif + + if (WSAStringToAddress(srcNonConst, af, NULL, (LPSOCKADDR)&sa, &len) == + 0) { + ret = 1; + } else { + if (WSAGetLastError() == WSAEINVAL) { + ret = -1; + } + } + free(srcNonConst); + memcpy(dst, &sa.sin_addr, sizeof(struct in_addr)); + return ret; } int win32_poll(struct pollfd *fds, unsigned int nfds, int timo) { - struct timeval timeout, *toptr; - fd_set ifds, ofds, efds, *ip, *op; - unsigned int i; - int rc; - - // Set up the file-descriptor sets in ifds, ofds and efds. - FD_ZERO(&ifds); - FD_ZERO(&ofds); - FD_ZERO(&efds); - for (i = 0, op = ip = 0; i < nfds; ++i) - { - fds[i].revents = 0; - if(fds[i].events & (POLLIN|POLLPRI)) - { - ip = &ifds; - FD_SET(fds[i].fd, ip); - } - if(fds[i].events & POLLOUT) - { - op = &ofds; - FD_SET(fds[i].fd, op); - } - FD_SET(fds[i].fd, &efds); - } - - // Set up the timeval structure for the timeout parameter - if(timo < 0) - { - toptr = 0; - } - else - { - toptr = &timeout; - timeout.tv_sec = timo / 1000; - timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000; - } + struct timeval timeout, *toptr; + fd_set ifds, ofds, efds, *ip, *op; + unsigned int i; + int rc; + + // Set up the file-descriptor sets in ifds, ofds and efds. + FD_ZERO(&ifds); + FD_ZERO(&ofds); + FD_ZERO(&efds); + for (i = 0, op = ip = 0; i < nfds; ++i) { + fds[i].revents = 0; + if (fds[i].events & (POLLIN | POLLPRI)) { + ip = &ifds; + FD_SET(fds[i].fd, ip); + } + if (fds[i].events & POLLOUT) { + op = &ofds; + FD_SET(fds[i].fd, op); + } + FD_SET(fds[i].fd, &efds); + } + + // Set up the timeval structure for the timeout parameter + if (timo < 0) { + toptr = 0; + } else { + toptr = &timeout; + timeout.tv_sec = timo / 1000; + timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000; + } #ifdef DEBUG_POLL - printf("Entering select() sec=%ld usec=%ld ip=%lx op=%lx\n", - (long)timeout.tv_sec, (long)timeout.tv_usec, (long)ip, (long)op); + printf("Entering select() sec=%ld usec=%ld ip=%lx op=%lx\n", + (long)timeout.tv_sec, (long)timeout.tv_usec, (long)ip, (long)op); #endif - rc = select(0, ip, op, &efds, toptr); + rc = select(0, ip, op, &efds, toptr); #ifdef DEBUG_POLL - printf("Exiting select rc=%d\n", rc); + printf("Exiting select rc=%d\n", rc); #endif - if(rc <= 0) - return rc; + if (rc <= 0) + return rc; - if(rc > 0) - { - for (i = 0; i < nfds; ++i) - { - int fd = fds[i].fd; - if(fds[i].events & (POLLIN|POLLPRI) && FD_ISSET(fd, &ifds)) - fds[i].revents |= POLLIN; - if(fds[i].events & POLLOUT && FD_ISSET(fd, &ofds)) - fds[i].revents |= POLLOUT; - if(FD_ISSET(fd, &efds)) // Some error was detected ... should be some way to know. - fds[i].revents |= POLLHUP; + if (rc > 0) { + for (i = 0; i < nfds; ++i) { + int fd = fds[i].fd; + if (fds[i].events & (POLLIN | POLLPRI) && + FD_ISSET(fd, &ifds)) + fds[i].revents |= POLLIN; + if (fds[i].events & POLLOUT && FD_ISSET(fd, &ofds)) + fds[i].revents |= POLLOUT; + if (FD_ISSET(fd, + &efds)) // Some error was detected ... should be some way to know. + fds[i].revents |= POLLHUP; #ifdef DEBUG_POLL - printf("%d %d %d revent = %x\n", - FD_ISSET(fd, &ifds), FD_ISSET(fd, &ofds), FD_ISSET(fd, &efds), - fds[i].revents - ); -#endif - } - } - return rc; + printf("%d %d %d revent = %x\n", FD_ISSET(fd, &ifds), + FD_ISSET(fd, &ofds), FD_ISSET(fd, &efds), + fds[i].revents); +#endif + } + } + return rc; } #if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 +#define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 #else - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL +#define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL #endif - -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ + +struct timezone { + int tz_minuteswest; /* minutes W of Greenwich */ + int tz_dsttime; /* type of dst correction */ }; - + int win32_gettimeofday(struct timeval *tv, struct timezone *tz) { - FILETIME ft; - unsigned __int64 tmpres = 0; - static int tzflag; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - - /*converting file time to unix epoch*/ - tmpres -= DELTA_EPOCH_IN_MICROSECS; - tmpres /= 10; /*convert into microseconds*/ - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; + FILETIME ft; + unsigned __int64 tmpres = 0; + static int tzflag; + + if (NULL != tv) { + GetSystemTimeAsFileTime(&ft); + + tmpres |= ft.dwHighDateTime; + tmpres <<= 32; + tmpres |= ft.dwLowDateTime; + + /*converting file time to unix epoch*/ + tmpres -= DELTA_EPOCH_IN_MICROSECS; + tmpres /= 10; /*convert into microseconds*/ + tv->tv_sec = (long)(tmpres / 1000000UL); + tv->tv_usec = (long)(tmpres % 1000000UL); + } + + if (NULL != tz) { + if (!tzflag) { + _tzset(); + tzflag++; + } + tz->tz_minuteswest = _timezone / 60; + tz->tz_dsttime = _daylight; + } + + return 0; } ssize_t win32_readv(int fd, const struct iovec *iov, int iovcnt) @@ -223,5 +204,3 @@ { return 0; } - -#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libiscsi-1.19.0+git.20210208/win32/win32_compat.h new/libiscsi-1.19.0+git.20210523/win32/win32_compat.h --- old/libiscsi-1.19.0+git.20210208/win32/win32_compat.h 2021-02-09 04:01:31.000000000 +0100 +++ new/libiscsi-1.19.0+git.20210523/win32/win32_compat.h 2021-05-23 22:23:52.000000000 +0200 @@ -30,12 +30,16 @@ #include <winsock2.h> #include <ws2tcpip.h> -#include <Ws2ipdef.h> +#include <ws2ipdef.h> #include <basetsd.h> #include <io.h> #include <malloc.h> #include <sys/stat.h> +#if defined(_MSC_VER) +#define __attribute__(attr) +#endif + #define SOL_TCP IPPROTO_TCP #if(_WIN32_WINNT < 0x0600) @@ -54,10 +58,12 @@ }; #endif +#ifdef _MSC_VER typedef int ssize_t; typedef int uid_t; typedef int gid_t; typedef int socklen_t; +#endif /* Wrapper macros to call misc. functions win32 is missing */ #define close closesocket @@ -70,12 +76,21 @@ #define poll(x, y, z) win32_poll(x, y, z) #define inet_pton(x,y,z) win32_inet_pton(x,y,z) #define sleep(x) Sleep(x * 1000) +#ifdef _MSC_VER #define getpid GetCurrentProcessId +#endif #if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf(a, b, c, ...) _snprintf_s(a, b, b, c, ## __VA_ARGS__) #endif +struct timezone; + +struct iovec { + void *iov_base; + size_t iov_len; +}; + int win32_inet_pton(int af, const char * src, void * dst); int win32_poll(struct pollfd *fds, unsigned int nfsd, int timeout); int win32_gettimeofday(struct timeval *tv, struct timezone *tz); @@ -83,11 +98,6 @@ ssize_t win32_readv(int fd, const struct iovec *iov, int iovcnt); int win32_dup2(int oldfd, int newfd); -struct iovec { - void *iov_base; - size_t iov_len; -}; - #define inline #endif // _WIN32 ++++++ libiscsi.obsinfo ++++++ --- /var/tmp/diff_new_pack.EAqRGi/_old 2021-06-27 18:58:25.880224780 +0200 +++ /var/tmp/diff_new_pack.EAqRGi/_new 2021-06-27 18:58:25.884224785 +0200 @@ -1,5 +1,5 @@ name: libiscsi -version: 1.19.0+git.20210208 -mtime: 1612839691 -commit: f87a5adaa08b2e77545aa404b0734544ed62e714 +version: 1.19.0+git.20210523 +mtime: 1621801432 +commit: 70759869ff857ae8c38ff58254265c6e43f9585e
