openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

storage: storageBackendWipeLocal: reduce variable scope 

Also use MIN instead of open-coding it.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Ján Tomko 2020-09-23 19:48:19 +02:00
parent 327580ff6b
commit 3a983573fb
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/storage/storage_util.c
View File

@ -2526,10 +2526,8 @@ storageBackendWipeLocal(const char *path,
size_t writebuf_length,
bool zero_end)
{
int written = 0;
unsigned long long remaining = 0;
off_t size;
size_t write_size = 0;
g_autofree char *writebuf = NULL;
if (VIR_ALLOC_N(writebuf, writebuf_length) < 0)
@ -2557,9 +2555,9 @@ storageBackendWipeLocal(const char *path,
remaining = wipe_len;
while (remaining > 0) {
size_t write_size = MIN(writebuf_length, remaining);
int written = safewrite(fd, writebuf, write_size);
write_size = (writebuf_length < remaining) ? writebuf_length : remaining;
written = safewrite(fd, writebuf, write_size);
if (written < 0) {
virReportSystemError(errno,
_("Failed to write %zu bytes to "