summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2015-08-03 01:24:48 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2015-08-03 01:24:48 +0000
commitddaceed224879130356d8802562339609e45d276 (patch)
treede771007372d5dedd8353c0a4a067801ff18c66c
parent7b25d1d63be96ffbe08d2b95956fe0f86905da48 (diff)
downloadsrc-test2-ddaceed224879130356d8802562339609e45d276.tar.gz
src-test2-ddaceed224879130356d8802562339609e45d276.zip
Notes
-rw-r--r--usr.bin/mkimg/image.c12
-rw-r--r--usr.bin/mkimg/image.h1
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.bin/mkimg/image.c b/usr.bin/mkimg/image.c
index be1c2e9fcbb2..a3bec6350e82 100644
--- a/usr.bin/mkimg/image.c
+++ b/usr.bin/mkimg/image.c
@@ -517,14 +517,14 @@ image_copyout_memory(int fd, size_t size, void *ptr)
return (0);
}
-static int
-image_copyout_zeroes(int fd, size_t size)
+int
+image_copyout_zeroes(int fd, size_t count)
{
static uint8_t *zeroes = NULL;
size_t sz;
int error;
- if (lseek(fd, (off_t)size, SEEK_CUR) != -1)
+ if (lseek(fd, (off_t)count, SEEK_CUR) != -1)
return (0);
/*
@@ -537,12 +537,12 @@ image_copyout_zeroes(int fd, size_t size)
return (ENOMEM);
}
- while (size > 0) {
- sz = (size > secsz) ? secsz : size;
+ while (count > 0) {
+ sz = (count > secsz) ? secsz : count;
error = image_copyout_memory(fd, sz, zeroes);
if (error)
return (error);
- size -= sz;
+ count -= sz;
}
return (0);
}
diff --git a/usr.bin/mkimg/image.h b/usr.bin/mkimg/image.h
index ce195d9b41ee..0405c5b37c27 100644
--- a/usr.bin/mkimg/image.h
+++ b/usr.bin/mkimg/image.h
@@ -35,6 +35,7 @@ int image_copyin(lba_t blk, int fd, uint64_t *sizep);
int image_copyout(int fd);
int image_copyout_done(int fd);
int image_copyout_region(int fd, lba_t blk, lba_t size);
+int image_copyout_zeroes(int fd, size_t count);
int image_data(lba_t blk, lba_t size);
lba_t image_get_size(void);
int image_init(void);