diff --git a/Makefile.am b/Makefile.am index b6635fc..ed67040 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,8 @@ ACLOCAL_AMFLAGS =-I m4 AUTOMAKE_OPTIONS = foreign subdir-objects -AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" +AM_CPPFLAGS=-I. -I$(srcdir)/include "-D_U_=__attribute__((unused))" \ + "-D_R_(A,B)=__attribute__((format(printf,A,B)))" AM_CFLAGS=$(WARN_CFLAGS) LDADD = lib/libiscsi.la -lpopt diff --git a/test-tool/iscsi-support.c b/test-tool/iscsi-support.c index 4a25ffc..6b130b7 100644 --- a/test-tool/iscsi-support.c +++ b/test-tool/iscsi-support.c @@ -74,6 +74,11 @@ void logging(int level, const char *format, ...) return; } + if (strncmp(LOG_BLANK_LINE, format, LOG_BLANK_LINE_CMP_LEN)==0) { + printf("\n"); + return; + } + va_start(ap, format); ret = vsnprintf(message, 1024, format, ap); va_end(ap); diff --git a/test-tool/iscsi-support.h b/test-tool/iscsi-support.h index 80ec1fe..9b39215 100644 --- a/test-tool/iscsi-support.h +++ b/test-tool/iscsi-support.h @@ -33,7 +33,14 @@ extern int loglevel; #define LOG_SILENT 0 #define LOG_NORMAL 1 #define LOG_VERBOSE 2 -void logging(int level, const char *format, ...); +void logging(int level, const char *format, ...) _R_(2,3); + +/* + * define special flags for logging a blank line, so compiler + * does not commplain when logging a "" + */ +#define LOG_BLANK_LINE " " +#define LOG_BLANK_LINE_CMP_LEN 2 #define CHECK_FOR_DATALOSS \ do { \ diff --git a/test-tool/test_prefetch10_0blocks.c b/test-tool/test_prefetch10_0blocks.c index efb8a2a..2ac46c1 100644 --- a/test-tool/test_prefetch10_0blocks.c +++ b/test-tool/test_prefetch10_0blocks.c @@ -28,7 +28,7 @@ test_prefetch10_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 0-blocks at LBA==0"); ret = prefetch10(iscsic, tgt_lun, 0, 0, 0, 0); diff --git a/test-tool/test_prefetch10_beyond_eol.c b/test-tool/test_prefetch10_beyond_eol.c index 75cdd84..1a689c7 100644 --- a/test-tool/test_prefetch10_beyond_eol.c +++ b/test-tool/test_prefetch10_beyond_eol.c @@ -34,7 +34,7 @@ test_prefetch10_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { ret = prefetch10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_prefetch10_flags.c b/test-tool/test_prefetch10_flags.c index abde426..361ee45 100644 --- a/test-tool/test_prefetch10_flags.c +++ b/test-tool/test_prefetch10_flags.c @@ -30,7 +30,7 @@ test_prefetch10_flags(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 flags"); logging(LOG_VERBOSE, "Test PREFETCH10 with IMMED==1"); diff --git a/test-tool/test_prefetch10_simple.c b/test-tool/test_prefetch10_simple.c index 94e9d79..3dc0218 100644 --- a/test-tool/test_prefetch10_simple.c +++ b/test-tool/test_prefetch10_simple.c @@ -30,7 +30,7 @@ test_prefetch10_simple(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { ret = prefetch10(iscsic, tgt_lun, 0, i, 0, 0); diff --git a/test-tool/test_prefetch16_0blocks.c b/test-tool/test_prefetch16_0blocks.c index 48ccb52..d5ae0ca 100644 --- a/test-tool/test_prefetch16_0blocks.c +++ b/test-tool/test_prefetch16_0blocks.c @@ -28,7 +28,7 @@ test_prefetch16_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 0-blocks at LBA==0"); ret = prefetch16(iscsic, tgt_lun, 0, 0, 0, 0); diff --git a/test-tool/test_prefetch16_beyond_eol.c b/test-tool/test_prefetch16_beyond_eol.c index 0eb4c2d..df5e8fc 100644 --- a/test-tool/test_prefetch16_beyond_eol.c +++ b/test-tool/test_prefetch16_beyond_eol.c @@ -29,7 +29,7 @@ test_prefetch16_beyond_eol(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { ret = prefetch16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_prefetch16_flags.c b/test-tool/test_prefetch16_flags.c index a09a387..a94d940 100644 --- a/test-tool/test_prefetch16_flags.c +++ b/test-tool/test_prefetch16_flags.c @@ -30,7 +30,7 @@ test_prefetch16_flags(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 flags"); logging(LOG_VERBOSE, "Test PREFETCH16 with IMMED==1"); diff --git a/test-tool/test_prefetch16_simple.c b/test-tool/test_prefetch16_simple.c index 1358404..81a2b1f 100644 --- a/test-tool/test_prefetch16_simple.c +++ b/test-tool/test_prefetch16_simple.c @@ -30,7 +30,7 @@ test_prefetch16_simple(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test PREFETCH16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { ret = prefetch16(iscsic, tgt_lun, 0, i, 0, 0); diff --git a/test-tool/test_prin_read_keys_simple.c b/test-tool/test_prin_read_keys_simple.c index 75870ea..ba7b81e 100644 --- a/test-tool/test_prin_read_keys_simple.c +++ b/test-tool/test_prin_read_keys_simple.c @@ -33,7 +33,7 @@ test_prin_read_keys_simple(void) int al; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test Persistent Reserve IN READ_KEYS works."); ret = prin_read_keys(iscsic, tgt_lun, &task, NULL); diff --git a/test-tool/test_read10_0blocks.c b/test-tool/test_read10_0blocks.c index e2628e7..376fbcd 100644 --- a/test-tool/test_read10_0blocks.c +++ b/test-tool/test_read10_0blocks.c @@ -28,7 +28,7 @@ test_read10_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 0-blocks at LBA==0"); ret = read10(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_read10_beyond_eol.c b/test-tool/test_read10_beyond_eol.c index 1fe4752..c0a459b 100644 --- a/test-tool/test_read10_beyond_eol.c +++ b/test-tool/test_read10_beyond_eol.c @@ -34,7 +34,7 @@ test_read10_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { ret = read10_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_read10_flags.c b/test-tool/test_read10_flags.c index 8137c96..86c46ab 100644 --- a/test-tool/test_read10_flags.c +++ b/test-tool/test_read10_flags.c @@ -30,7 +30,7 @@ test_read10_flags(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 flags"); /* This test is only valid for SBC devices */ diff --git a/test-tool/test_read10_rdprotect.c b/test-tool/test_read10_rdprotect.c index d7755d5..070938c 100644 --- a/test-tool/test_read10_rdprotect.c +++ b/test-tool/test_read10_rdprotect.c @@ -40,7 +40,7 @@ test_read10_rdprotect(void) * Try out different non-zero values for RDPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 with non-zero RDPROTECT"); for (i = 1; i < 8; i++) { ret = read10_invalidfieldincdb(iscsic, tgt_lun, 0, diff --git a/test-tool/test_read10_simple.c b/test-tool/test_read10_simple.c index 91bf8dc..6aa7095 100644 --- a/test-tool/test_read10_simple.c +++ b/test-tool/test_read10_simple.c @@ -32,7 +32,7 @@ test_read10_simple(void) int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { ret = read10(iscsic, tgt_lun, 0, i * block_size, diff --git a/test-tool/test_read12_0blocks.c b/test-tool/test_read12_0blocks.c index 33f9a09..84c0199 100644 --- a/test-tool/test_read12_0blocks.c +++ b/test-tool/test_read12_0blocks.c @@ -28,7 +28,7 @@ test_read12_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 0-blocks at LBA==0"); ret = read12(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_read12_beyond_eol.c b/test-tool/test_read12_beyond_eol.c index fe9d5cd..6444957 100644 --- a/test-tool/test_read12_beyond_eol.c +++ b/test-tool/test_read12_beyond_eol.c @@ -34,7 +34,7 @@ test_read12_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { ret = read12_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_read12_flags.c b/test-tool/test_read12_flags.c index 4bbbc64..b46ecfb 100644 --- a/test-tool/test_read12_flags.c +++ b/test-tool/test_read12_flags.c @@ -30,7 +30,7 @@ test_read12_flags(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 flags"); /* This test is only valid for SBC devices */ diff --git a/test-tool/test_read12_rdprotect.c b/test-tool/test_read12_rdprotect.c index 29be897..ec65ffd 100644 --- a/test-tool/test_read12_rdprotect.c +++ b/test-tool/test_read12_rdprotect.c @@ -40,7 +40,7 @@ test_read12_rdprotect(void) * Try out different non-zero values for RDPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 with non-zero RDPROTECT"); for (i = 1; i < 8; i++) { ret = read12_invalidfieldincdb(iscsic, tgt_lun, 0, diff --git a/test-tool/test_read12_simple.c b/test-tool/test_read12_simple.c index a55d50c..da6d84c 100644 --- a/test-tool/test_read12_simple.c +++ b/test-tool/test_read12_simple.c @@ -32,7 +32,7 @@ test_read12_simple(void) int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ12 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { ret = read12(iscsic, tgt_lun, 0, i * block_size, diff --git a/test-tool/test_read16_0blocks.c b/test-tool/test_read16_0blocks.c index 1b45e10..335b812 100644 --- a/test-tool/test_read16_0blocks.c +++ b/test-tool/test_read16_0blocks.c @@ -30,7 +30,7 @@ test_read16_0blocks(void) CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 0-blocks at LBA==0"); ret = read16(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_read16_beyond_eol.c b/test-tool/test_read16_beyond_eol.c index 287ded6..f8d0811 100644 --- a/test-tool/test_read16_beyond_eol.c +++ b/test-tool/test_read16_beyond_eol.c @@ -31,7 +31,7 @@ test_read16_beyond_eol(void) CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { ret = read16_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_read16_flags.c b/test-tool/test_read16_flags.c index c77d632..6694835 100644 --- a/test-tool/test_read16_flags.c +++ b/test-tool/test_read16_flags.c @@ -32,7 +32,7 @@ test_read16_flags(void) CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 flags"); logging(LOG_VERBOSE, "Test READ16 with DPO==1"); diff --git a/test-tool/test_read16_rdprotect.c b/test-tool/test_read16_rdprotect.c index d83a447..ff349f4 100644 --- a/test-tool/test_read16_rdprotect.c +++ b/test-tool/test_read16_rdprotect.c @@ -36,7 +36,7 @@ test_read16_rdprotect(void) * Try out different non-zero values for RDPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 with non-zero RDPROTECT"); for (i = 1; i < 8; i++) { ret = read16_invalidfieldincdb(iscsic, tgt_lun, 0, diff --git a/test-tool/test_read16_simple.c b/test-tool/test_read16_simple.c index 5781b07..505de49 100644 --- a/test-tool/test_read16_simple.c +++ b/test-tool/test_read16_simple.c @@ -33,7 +33,7 @@ test_read16_simple(void) CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { ret = read16(iscsic, tgt_lun, 0, i * block_size, diff --git a/test-tool/test_read6_0blocks.c b/test-tool/test_read6_0blocks.c index 98624ee..44e3f5b 100644 --- a/test-tool/test_read6_0blocks.c +++ b/test-tool/test_read6_0blocks.c @@ -28,7 +28,7 @@ test_read6_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ6 0-blocks at LBA==0"); ret = read6(iscsic, tgt_lun, 0, 0, block_size, NULL); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_read6_beyond_eol.c b/test-tool/test_read6_beyond_eol.c index 5db7de2..d1354aa 100644 --- a/test-tool/test_read6_beyond_eol.c +++ b/test-tool/test_read6_beyond_eol.c @@ -35,7 +35,7 @@ test_read6_beyond_eol(void) } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ6 1-255 blocks one block beyond the end"); for (i = 1; i <= 255; i++) { ret = read6_lbaoutofrange(iscsic, tgt_lun, num_blocks + 1 - i, diff --git a/test-tool/test_read6_simple.c b/test-tool/test_read6_simple.c index 1cffc3b..8961ba8 100644 --- a/test-tool/test_read6_simple.c +++ b/test-tool/test_read6_simple.c @@ -32,7 +32,7 @@ test_read6_simple(void) int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test READ6 of 1-255 blocks at the start of the LUN"); for (i = 1; i <= 255; i++) { ret = read6(iscsic, tgt_lun, 0, i * block_size, diff --git a/test-tool/test_readcapacity10_simple.c b/test-tool/test_readcapacity10_simple.c index c953d5f..abfcbaf 100644 --- a/test-tool/test_readcapacity10_simple.c +++ b/test-tool/test_readcapacity10_simple.c @@ -32,7 +32,7 @@ test_readcapacity10_simple(void) int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test basic READCAPACITY10"); ret = readcapacity10(iscsic, tgt_lun, 0, 0); diff --git a/test-tool/test_readcapacity16_alloclen.c b/test-tool/test_readcapacity16_alloclen.c index d0530dc..098bf40 100644 --- a/test-tool/test_readcapacity16_alloclen.c +++ b/test-tool/test_readcapacity16_alloclen.c @@ -32,7 +32,7 @@ test_readcapacity16_alloclen(void) int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that READCAPACITY16 with alloc_len 0-15 is not an error"); for (i = 0; i < 16; i++) { diff --git a/test-tool/test_readcapacity16_simple.c b/test-tool/test_readcapacity16_simple.c index 83af45c..599d6f3 100644 --- a/test-tool/test_readcapacity16_simple.c +++ b/test-tool/test_readcapacity16_simple.c @@ -32,7 +32,7 @@ test_readcapacity16_simple(void) int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that READCAPACITY16 works"); ret = readcapacity16(iscsic, tgt_lun, 16); diff --git a/test-tool/test_testunitready_simple.c b/test-tool/test_testunitready_simple.c index 2917bf2..d01e521 100644 --- a/test-tool/test_testunitready_simple.c +++ b/test-tool/test_testunitready_simple.c @@ -28,7 +28,7 @@ test_testunitready_simple(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test TESTUNITREADY"); ret = testunitready(iscsic, tgt_lun); CU_ASSERT_EQUAL(ret, 0); diff --git a/test-tool/test_unmap_0blocks.c b/test-tool/test_unmap_0blocks.c index 67479ef..63bf1dd 100644 --- a/test-tool/test_unmap_0blocks.c +++ b/test-tool/test_unmap_0blocks.c @@ -36,7 +36,7 @@ test_unmap_0blocks(void) CHECK_FOR_THIN_PROVISIONING; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test UNMAP of 0 blocks at LBA:0-255 as a single descriptor"); for (i = 0; i < 256; i++) { list[0].lba = i; diff --git a/test-tool/test_unmap_simple.c b/test-tool/test_unmap_simple.c index 9b8b297..c96d0f0 100644 --- a/test-tool/test_unmap_simple.c +++ b/test-tool/test_unmap_simple.c @@ -36,7 +36,7 @@ test_unmap_simple(void) CHECK_FOR_THIN_PROVISIONING; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test UNMAP of 1-256 blocks at the start of the LUN as a single descriptor"); for (i = 1; i <= 256; i++) { list[0].lba = 0; diff --git a/test-tool/test_verify10_0blocks.c b/test-tool/test_verify10_0blocks.c index 6270f08..1411671 100644 --- a/test-tool/test_verify10_0blocks.c +++ b/test-tool/test_verify10_0blocks.c @@ -28,7 +28,7 @@ test_verify10_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 0-blocks at LBA==0"); ret = verify10(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 1, NULL); diff --git a/test-tool/test_verify10_beyond_eol.c b/test-tool/test_verify10_beyond_eol.c index 76487ab..ac5f14a 100644 --- a/test-tool/test_verify10_beyond_eol.c +++ b/test-tool/test_verify10_beyond_eol.c @@ -34,7 +34,7 @@ test_verify10_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify10_flags.c b/test-tool/test_verify10_flags.c index 1185403..a8431fa 100644 --- a/test-tool/test_verify10_flags.c +++ b/test-tool/test_verify10_flags.c @@ -32,7 +32,7 @@ test_verify10_flags(void) int ret; unsigned char *buf = malloc(block_size); - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 flags"); ret = read10(iscsic, tgt_lun, 0, block_size, diff --git a/test-tool/test_verify10_mismatch.c b/test-tool/test_verify10_mismatch.c index de4828f..f7f5ef2 100644 --- a/test-tool/test_verify10_mismatch.c +++ b/test-tool/test_verify10_mismatch.c @@ -30,7 +30,7 @@ test_verify10_mismatch(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify10_mismatch_no_cmp.c b/test-tool/test_verify10_mismatch_no_cmp.c index 6bb0ad9..f7f7e56 100644 --- a/test-tool/test_verify10_mismatch_no_cmp.c +++ b/test-tool/test_verify10_mismatch_no_cmp.c @@ -31,7 +31,7 @@ test_verify10_mismatch_no_cmp(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 without BYTCHK for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify10_simple.c b/test-tool/test_verify10_simple.c index 654a918..4dac5ce 100644 --- a/test-tool/test_verify10_simple.c +++ b/test-tool/test_verify10_simple.c @@ -31,7 +31,7 @@ test_verify10_simple(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify10_vrprotect.c b/test-tool/test_verify10_vrprotect.c index 673d50c..50828f3 100644 --- a/test-tool/test_verify10_vrprotect.c +++ b/test-tool/test_verify10_vrprotect.c @@ -31,7 +31,7 @@ test_verify10_vrprotect(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY10 with non-zero VRPROTECT"); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_verify12_0blocks.c b/test-tool/test_verify12_0blocks.c index dcee04f..ffa1e0b 100644 --- a/test-tool/test_verify12_0blocks.c +++ b/test-tool/test_verify12_0blocks.c @@ -28,7 +28,7 @@ test_verify12_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 0-blocks at LBA==0"); ret = verify12(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 1, NULL); diff --git a/test-tool/test_verify12_beyond_eol.c b/test-tool/test_verify12_beyond_eol.c index 31ae2c3..74a0e04 100644 --- a/test-tool/test_verify12_beyond_eol.c +++ b/test-tool/test_verify12_beyond_eol.c @@ -34,7 +34,7 @@ test_verify12_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify12_flags.c b/test-tool/test_verify12_flags.c index cffa10a..e8e14d2 100644 --- a/test-tool/test_verify12_flags.c +++ b/test-tool/test_verify12_flags.c @@ -32,7 +32,7 @@ test_verify12_flags(void) int ret; unsigned char *buf = malloc(block_size); - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 flags"); ret = read12(iscsic, tgt_lun, 0, block_size, diff --git a/test-tool/test_verify12_mismatch.c b/test-tool/test_verify12_mismatch.c index 4d76845..7b59425 100644 --- a/test-tool/test_verify12_mismatch.c +++ b/test-tool/test_verify12_mismatch.c @@ -30,7 +30,7 @@ test_verify12_mismatch(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify12_mismatch_no_cmp.c b/test-tool/test_verify12_mismatch_no_cmp.c index 8c72c0e..4ca1076 100644 --- a/test-tool/test_verify12_mismatch_no_cmp.c +++ b/test-tool/test_verify12_mismatch_no_cmp.c @@ -31,7 +31,7 @@ test_verify12_mismatch_no_cmp(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 without BYTCHK for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify12_simple.c b/test-tool/test_verify12_simple.c index a3c25f7..cb71626 100644 --- a/test-tool/test_verify12_simple.c +++ b/test-tool/test_verify12_simple.c @@ -31,7 +31,7 @@ test_verify12_simple(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify12_vrprotect.c b/test-tool/test_verify12_vrprotect.c index 0563d9c..14d24dd 100644 --- a/test-tool/test_verify12_vrprotect.c +++ b/test-tool/test_verify12_vrprotect.c @@ -31,7 +31,7 @@ test_verify12_vrprotect(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY12 with non-zero VRPROTECT"); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_verify16_0blocks.c b/test-tool/test_verify16_0blocks.c index 046b8e9..b091a39 100644 --- a/test-tool/test_verify16_0blocks.c +++ b/test-tool/test_verify16_0blocks.c @@ -28,7 +28,7 @@ test_verify16_0blocks(void) { int ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 0-blocks at LBA==0"); ret = verify16(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 1, NULL); diff --git a/test-tool/test_verify16_beyond_eol.c b/test-tool/test_verify16_beyond_eol.c index d273237..c87155d 100644 --- a/test-tool/test_verify16_beyond_eol.c +++ b/test-tool/test_verify16_beyond_eol.c @@ -29,7 +29,7 @@ test_verify16_beyond_eol(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify16_flags.c b/test-tool/test_verify16_flags.c index 056ce31..0520114 100644 --- a/test-tool/test_verify16_flags.c +++ b/test-tool/test_verify16_flags.c @@ -32,7 +32,7 @@ test_verify16_flags(void) int ret; unsigned char *buf = malloc(block_size); - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 flags"); ret = read16(iscsic, tgt_lun, 0, block_size, diff --git a/test-tool/test_verify16_mismatch.c b/test-tool/test_verify16_mismatch.c index 7a0c4d8..fbceb98 100644 --- a/test-tool/test_verify16_mismatch.c +++ b/test-tool/test_verify16_mismatch.c @@ -30,7 +30,7 @@ test_verify16_mismatch(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify16_mismatch_no_cmp.c b/test-tool/test_verify16_mismatch_no_cmp.c index ef00b57..f5f633e 100644 --- a/test-tool/test_verify16_mismatch_no_cmp.c +++ b/test-tool/test_verify16_mismatch_no_cmp.c @@ -31,7 +31,7 @@ test_verify16_mismatch_no_cmp(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 without BYTCHK for blocks 1-255"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify16_simple.c b/test-tool/test_verify16_simple.c index 671eaea..bb62466 100644 --- a/test-tool/test_verify16_simple.c +++ b/test-tool/test_verify16_simple.c @@ -31,7 +31,7 @@ test_verify16_simple(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 of 1-256 blocks at the end of the LUN"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_verify16_vrprotect.c b/test-tool/test_verify16_vrprotect.c index 61b5998..60ca4a0 100644 --- a/test-tool/test_verify16_vrprotect.c +++ b/test-tool/test_verify16_vrprotect.c @@ -31,7 +31,7 @@ test_verify16_vrprotect(void) { int i, ret; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test VERIFY16 with non-zero VRPROTECT"); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_write10_0blocks.c b/test-tool/test_write10_0blocks.c index 7318830..bfd1fea 100644 --- a/test-tool/test_write10_0blocks.c +++ b/test-tool/test_write10_0blocks.c @@ -35,7 +35,7 @@ test_write10_0blocks(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 0-blocks at LBA==0"); ret = write10(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_write10_beyond_eol.c b/test-tool/test_write10_beyond_eol.c index 832e885..271e000 100644 --- a/test-tool/test_write10_beyond_eol.c +++ b/test-tool/test_write10_beyond_eol.c @@ -36,7 +36,7 @@ test_write10_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_write10_flags.c b/test-tool/test_write10_flags.c index 7ecebe3..cd40ec2 100644 --- a/test-tool/test_write10_flags.c +++ b/test-tool/test_write10_flags.c @@ -33,7 +33,7 @@ test_write10_flags(void) CHECK_FOR_DATALOSS; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 flags"); buf = malloc(block_size); diff --git a/test-tool/test_write10_simple.c b/test-tool/test_write10_simple.c index bb45b88..5845a22 100644 --- a/test-tool/test_write10_simple.c +++ b/test-tool/test_write10_simple.c @@ -33,7 +33,7 @@ test_write10_simple(void) CHECK_FOR_DATALOSS; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { diff --git a/test-tool/test_write10_wrprotect.c b/test-tool/test_write10_wrprotect.c index 19a13be..08f179c 100644 --- a/test-tool/test_write10_wrprotect.c +++ b/test-tool/test_write10_wrprotect.c @@ -37,7 +37,7 @@ test_write10_wrprotect(void) * Try out different non-zero values for WRPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE10 with non-zero WRPROTECT"); buf = malloc(block_size); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_write12_0blocks.c b/test-tool/test_write12_0blocks.c index 0448c22..4443ee1 100644 --- a/test-tool/test_write12_0blocks.c +++ b/test-tool/test_write12_0blocks.c @@ -35,7 +35,7 @@ test_write12_0blocks(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 0-blocks at LBA==0"); ret = write12(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_write12_beyond_eol.c b/test-tool/test_write12_beyond_eol.c index f5e9ec6..d59dc7b 100644 --- a/test-tool/test_write12_beyond_eol.c +++ b/test-tool/test_write12_beyond_eol.c @@ -36,7 +36,7 @@ test_write12_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_write12_flags.c b/test-tool/test_write12_flags.c index efe6e6a..5013fa3 100644 --- a/test-tool/test_write12_flags.c +++ b/test-tool/test_write12_flags.c @@ -33,7 +33,7 @@ test_write12_flags(void) CHECK_FOR_DATALOSS; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 flags"); buf = malloc(block_size); diff --git a/test-tool/test_write12_simple.c b/test-tool/test_write12_simple.c index 36eec57..9ef85a0 100644 --- a/test-tool/test_write12_simple.c +++ b/test-tool/test_write12_simple.c @@ -33,7 +33,7 @@ test_write12_simple(void) CHECK_FOR_DATALOSS; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { diff --git a/test-tool/test_write12_wrprotect.c b/test-tool/test_write12_wrprotect.c index f0ed5d1..b1bfef7 100644 --- a/test-tool/test_write12_wrprotect.c +++ b/test-tool/test_write12_wrprotect.c @@ -37,7 +37,7 @@ test_write12_wrprotect(void) * Try out different non-zero values for WRPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE12 with non-zero WRPROTECT"); buf = malloc(block_size); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_write16_0blocks.c b/test-tool/test_write16_0blocks.c index b4ee573..6b182d1 100644 --- a/test-tool/test_write16_0blocks.c +++ b/test-tool/test_write16_0blocks.c @@ -31,7 +31,7 @@ test_write16_0blocks(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 0-blocks at LBA==0"); ret = write16(iscsic, tgt_lun, 0, 0, block_size, 0, 0, 0, 0, 0, NULL); diff --git a/test-tool/test_write16_beyond_eol.c b/test-tool/test_write16_beyond_eol.c index 65f1eb4..b075de0 100644 --- a/test-tool/test_write16_beyond_eol.c +++ b/test-tool/test_write16_beyond_eol.c @@ -32,7 +32,7 @@ test_write16_beyond_eol(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_write16_flags.c b/test-tool/test_write16_flags.c index f7e26eb..121c6fe 100644 --- a/test-tool/test_write16_flags.c +++ b/test-tool/test_write16_flags.c @@ -34,7 +34,7 @@ test_write16_flags(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 flags"); buf = malloc(block_size); diff --git a/test-tool/test_write16_simple.c b/test-tool/test_write16_simple.c index 4dea767..9c8a50e 100644 --- a/test-tool/test_write16_simple.c +++ b/test-tool/test_write16_simple.c @@ -34,7 +34,7 @@ test_write16_simple(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { diff --git a/test-tool/test_write16_wrprotect.c b/test-tool/test_write16_wrprotect.c index c5db34d..09f07e0 100644 --- a/test-tool/test_write16_wrprotect.c +++ b/test-tool/test_write16_wrprotect.c @@ -38,7 +38,7 @@ test_write16_wrprotect(void) * Try out different non-zero values for WRPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITE16 with non-zero WRPROTECT"); buf = malloc(block_size); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_writesame10_0blocks.c b/test-tool/test_writesame10_0blocks.c index 0ad900e..66c1594 100644 --- a/test-tool/test_writesame10_0blocks.c +++ b/test-tool/test_writesame10_0blocks.c @@ -36,7 +36,7 @@ test_writesame10_0blocks(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 0-blocks at LBA==0"); ret = writesame10(iscsic, tgt_lun, 0, block_size, 0, diff --git a/test-tool/test_writesame10_beyond_eol.c b/test-tool/test_writesame10_beyond_eol.c index b1b2549..02a794c 100644 --- a/test-tool/test_writesame10_beyond_eol.c +++ b/test-tool/test_writesame10_beyond_eol.c @@ -37,7 +37,7 @@ test_writesame10_beyond_eol(void) return; } - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size); diff --git a/test-tool/test_writesame10_simple.c b/test-tool/test_writesame10_simple.c index c6de61c..264b00a 100644 --- a/test-tool/test_writesame10_simple.c +++ b/test-tool/test_writesame10_simple.c @@ -34,7 +34,7 @@ test_writesame10_simple(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { diff --git a/test-tool/test_writesame10_unmap.c b/test-tool/test_writesame10_unmap.c index c192afb..b28a074 100644 --- a/test-tool/test_writesame10_unmap.c +++ b/test-tool/test_writesame10_unmap.c @@ -36,7 +36,7 @@ test_writesame10_unmap(void) CHECK_FOR_LBPWS10; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_writesame10_unmap_unaligned.c b/test-tool/test_writesame10_unmap_unaligned.c index 1ad7d0a..d59b8b9 100644 --- a/test-tool/test_writesame10_unmap_unaligned.c +++ b/test-tool/test_writesame10_unmap_unaligned.c @@ -37,7 +37,7 @@ test_writesame10_unmap_unaligned(void) CHECK_FOR_LBPPB_GT_1; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that unaligned WRITESAME10 Unmap fails. LBPPB==%d", lbppb); for (i = 1; i < lbppb; i++) { logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME10 at LBA:%d", lbppb - i, i); diff --git a/test-tool/test_writesame10_unmap_until_end.c b/test-tool/test_writesame10_unmap_until_end.c index 52bc1d4..3d3051f 100644 --- a/test-tool/test_writesame10_unmap_until_end.c +++ b/test-tool/test_writesame10_unmap_until_end.c @@ -36,7 +36,7 @@ test_writesame10_unmap_until_end(void) CHECK_FOR_LBPWS10; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 of 1-256 blocks at the end of the LUN by setting number-of-blocks==0"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_writesame10_wrprotect.c b/test-tool/test_writesame10_wrprotect.c index fea783f..674387b 100644 --- a/test-tool/test_writesame10_wrprotect.c +++ b/test-tool/test_writesame10_wrprotect.c @@ -38,7 +38,7 @@ test_writesame10_wrprotect(void) * Try out different non-zero values for WRPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME10 with non-zero WRPROTECT"); buf = malloc(block_size); for (i = 1; i < 8; i++) { diff --git a/test-tool/test_writesame16_0blocks.c b/test-tool/test_writesame16_0blocks.c index 963b6e0..ae9e77d 100644 --- a/test-tool/test_writesame16_0blocks.c +++ b/test-tool/test_writesame16_0blocks.c @@ -31,7 +31,7 @@ test_writesame16_0blocks(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 0-blocks at LBA==0"); ret = writesame16(iscsic, tgt_lun, 0, block_size, 0, diff --git a/test-tool/test_writesame16_beyond_eol.c b/test-tool/test_writesame16_beyond_eol.c index e15777b..ac0f56f 100644 --- a/test-tool/test_writesame16_beyond_eol.c +++ b/test-tool/test_writesame16_beyond_eol.c @@ -32,7 +32,7 @@ test_writesame16_beyond_eol(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 1-256 blocks one block beyond the end"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size); diff --git a/test-tool/test_writesame16_simple.c b/test-tool/test_writesame16_simple.c index b13b5db..bee4255 100644 --- a/test-tool/test_writesame16_simple.c +++ b/test-tool/test_writesame16_simple.c @@ -33,7 +33,7 @@ test_writesame16_simple(void) CHECK_FOR_DATALOSS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { diff --git a/test-tool/test_writesame16_unmap.c b/test-tool/test_writesame16_unmap.c index 852d81f..a2d29e0 100644 --- a/test-tool/test_writesame16_unmap.c +++ b/test-tool/test_writesame16_unmap.c @@ -37,7 +37,7 @@ test_writesame16_unmap(void) CHECK_FOR_LBPWS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 of 1-256 blocks at the start of the LUN"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_writesame16_unmap_unaligned.c b/test-tool/test_writesame16_unmap_unaligned.c index ab9feeb..1d55835 100644 --- a/test-tool/test_writesame16_unmap_unaligned.c +++ b/test-tool/test_writesame16_unmap_unaligned.c @@ -37,7 +37,7 @@ test_writesame16_unmap_unaligned(void) CHECK_FOR_LBPPB_GT_1; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test that unaligned WRITESAME16 Unmap fails. LBPPB==%d", lbppb); for (i = 1; i < lbppb; i++) { logging(LOG_VERBOSE, "Unmap %d blocks using WRITESAME16 at LBA:%d", lbppb - i, i); diff --git a/test-tool/test_writesame16_unmap_until_end.c b/test-tool/test_writesame16_unmap_until_end.c index 02610a9..2dff894 100644 --- a/test-tool/test_writesame16_unmap_until_end.c +++ b/test-tool/test_writesame16_unmap_until_end.c @@ -36,7 +36,7 @@ test_writesame16_unmap_until_end(void) CHECK_FOR_LBPWS; CHECK_FOR_SBC; - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 of 1-256 blocks at the end of the LUN by setting number-of-blocks==0"); for (i = 1; i <= 256; i++) { unsigned char *buf = malloc(block_size * i); diff --git a/test-tool/test_writesame16_wrprotect.c b/test-tool/test_writesame16_wrprotect.c index 8221ba8..a75e9f5 100644 --- a/test-tool/test_writesame16_wrprotect.c +++ b/test-tool/test_writesame16_wrprotect.c @@ -38,7 +38,7 @@ test_writesame16_wrprotect(void) * Try out different non-zero values for WRPROTECT. * They should all fail. */ - logging(LOG_VERBOSE, ""); + logging(LOG_VERBOSE, LOG_BLANK_LINE); logging(LOG_VERBOSE, "Test WRITESAME16 with non-zero WRPROTECT"); buf = malloc(block_size); for (i = 1; i < 8; i++) {