Merge pull request #162 from saschagrunert/fixes

Fix dead increment and assignments
This commit is contained in:
Giuseppe Scrivano 2020-01-08 10:46:16 +01:00 committed by GitHub
commit 7a06acbfda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 4 deletions

2
main.c
View File

@ -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));
if (ret < 0)
return ret;
written += ret;
nread -= ret;
}
while (nread);
@ -2830,7 +2829,6 @@ empty_dirfd (int fd)
static int
empty_dir (struct ovl_layer *l, const char *path)
{
cleanup_dir DIR *dp = NULL;
cleanup_close int cleanup_fd = -1;
int ret;

View File

@ -94,8 +94,6 @@ strconcat3 (char *dest, size_t size, const char *s1, const char *s2, const char
memcpy (current, s3, t);
current += t;
size -= t;
}
*current = '\0';