mirror of
https://github.com/containers/fuse-overlayfs.git
synced 2025-09-13 09:17:42 -04:00
Merge pull request #162 from saschagrunert/fixes
Fix dead increment and assignments
This commit is contained in:
commit
7a06acbfda
2
main.c
2
main.c
@ -2516,7 +2516,6 @@ copy_fd_to_fd (int sfd, int dfd, char *buf, size_t buf_size)
|
|||||||
ret = TEMP_FAILURE_RETRY (write (dfd, buf + written, nread));
|
ret = TEMP_FAILURE_RETRY (write (dfd, buf + written, nread));
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
written += ret;
|
|
||||||
nread -= ret;
|
nread -= ret;
|
||||||
}
|
}
|
||||||
while (nread);
|
while (nread);
|
||||||
@ -2830,7 +2829,6 @@ empty_dirfd (int fd)
|
|||||||
static int
|
static int
|
||||||
empty_dir (struct ovl_layer *l, const char *path)
|
empty_dir (struct ovl_layer *l, const char *path)
|
||||||
{
|
{
|
||||||
cleanup_dir DIR *dp = NULL;
|
|
||||||
cleanup_close int cleanup_fd = -1;
|
cleanup_close int cleanup_fd = -1;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user