Page MenuHomeFreeBSD
Files F109862393

D34387.diff
No OneTemporary
Actions

D34387.diff
View Options

diff --git a/tests/sys/cddl/zfs/bin/readmmap.c b/tests/sys/cddl/zfs/bin/readmmap.c
--- a/tests/sys/cddl/zfs/bin/readmmap.c
+++ b/tests/sys/cddl/zfs/bin/readmmap.c
@@ -83,7 +83,7 @@
bytes = write(fd, buf, size);
if (bytes != size) {
- (void) printf("short write: %d != %ud\n", bytes, size);
+ (void) printf("short write: %d != %zu\n", bytes, size);
retval = 1;
goto end;
}
@@ -114,20 +114,20 @@
bytes = pread(fd, buf, size, 0);
if (bytes != size) {
- (void) printf("short read: %d != %ud\n", bytes, size);
+ (void) printf("short read: %d != %zu\n", bytes, size);
retval = 1;
goto end;
}
if (buf[idx] != 1) {
(void) printf(
- "bad data from read! got buf[%ud]=%d, expected 1\n",
+ "bad data from read! got buf[%zu]=%d, expected 1\n",
idx, buf[idx]);
retval = 1;
goto end;
}
- (void) printf("good data from read: buf[%ud]=1\n", idx);
+ (void) printf("good data from read: buf[%zu]=1\n", idx);
end:
if (fd != -1) {
(void) close(fd);
diff --git a/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c b/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
--- a/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
+++ b/tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c
@@ -227,7 +227,7 @@
(void) close(fd);
if (ret != 0) {
- fprintf(stderr, "read(%d, buf, %d)\n", fd, sizeof (buf));
+ fprintf(stderr, "read(%d, buf, %zu)\n", fd, sizeof (buf));
exit(1);
}
@@ -253,7 +253,7 @@
(void) close(fd);
if (ret != 0) {
- fprintf(stderr, "write(%d, buf, %d)\n", fd, strlen(buf));
+ fprintf(stderr, "write(%d, buf, %zu)\n", fd, strlen(buf));
exit(1);
}
diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
--- a/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
+++ b/tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c
@@ -332,7 +332,7 @@
int file_offset = chunk_start + chunk_offset;
if (good_data && (actual_buf[i] != desired_buf[i])){
fprintf(stderr, "fsync_integrity: miscompare at "
- "chunk %i, chunk offset %lx, file offset %lx\n",
+ "chunk %i, chunk offset %x, file offset %x\n",
chunk_idx, chunk_offset, file_offset);
fprintf(stderr, "Expected %016lx, got %016lx\n",
desired_buf[i], actual_buf[i]);
@@ -341,7 +341,7 @@
}
else if (!good_data && (actual_buf[i] == desired_buf[i])) {
fprintf(stderr, "fsync_integrity: miscompare ends at "
- "chunk %i, chunk offset %lx, file offset %lx\n",
+ "chunk %i, chunk offset %x, file offset %x\n",
chunk_idx, chunk_offset, file_offset);
good_data = 1;
}
diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c b/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
--- a/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
+++ b/tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c
@@ -370,7 +370,7 @@
int file_offset = chunk_start + chunk_offset;
if (good_data && (actual_buf[i] != desired_buf[i])){
fprintf(stderr, "txg_integrity: miscompare at "
- "chunk %i, chunk offset %lx, file offset %lx\n",
+ "chunk %i, chunk offset %x, file offset %x\n",
chunk_idx, chunk_offset, file_offset);
fprintf(stderr, "Expected %16lx, got %16lx\n",
desired_buf[i], actual_buf[i]);
@@ -379,7 +379,7 @@
}
else if (!good_data && (actual_buf[i] == desired_buf[i])) {
fprintf(stderr, "txg_integrity: miscompare ends at "
- "chunk %i, chunk offset %lx, file offset %lx\n",
+ "chunk %i, chunk offset %x, file offset %x\n",
chunk_idx, chunk_offset, file_offset);
good_data = 1;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 11, 11:44 AM (12 h, 13 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16594441
Default Alt Text
D34387.diff (3 KB)

Event Timeline