diff options
| author | Orestis <orestisf1993@gmail.com> | 2018-10-13 21:07:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-13 21:07:17 +0300 |
| commit | 565d38c5af0827147ec0bdef3c1897006d831b18 (patch) | |
| tree | 6f64f4aa5944a4e02bb4101d4e4c2581cc37fd31 /libi3 | |
| parent | 7c0994dafc91944477e03700304b2308b0e3fdb1 (diff) | |
| parent | 687238b79b06254238926d02739a5670d4d00c94 (diff) | |
| download | i3-565d38c5af0827147ec0bdef3c1897006d831b18.tar.gz i3-565d38c5af0827147ec0bdef3c1897006d831b18.zip | |
Merge pull request #3454 from alanbarr/cppcheck_fixes_2
Cppcheck Fixes
Diffstat (limited to 'libi3')
| -rw-r--r-- | libi3/mkdirp.c | 5 | ||||
| -rw-r--r-- | libi3/safewrappers.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/libi3/mkdirp.c b/libi3/mkdirp.c index 1fc8c346..f5281bd7 100644 --- a/libi3/mkdirp.c +++ b/libi3/mkdirp.c @@ -44,10 +44,7 @@ int mkdirp(const char *path, mode_t mode) { char *sep = strrchr(copy, '/'); if (sep == NULL) { - if (copy != NULL) { - free(copy); - copy = NULL; - } + free(copy); return -1; } *sep = '\0'; diff --git a/libi3/safewrappers.c b/libi3/safewrappers.c index 04bbda44..1802b327 100644 --- a/libi3/safewrappers.c +++ b/libi3/safewrappers.c @@ -70,7 +70,7 @@ ssize_t writeall(int fd, const void *buf, size_t count) { size_t written = 0; while (written < count) { - const ssize_t n = write(fd, buf + written, count - written); + const ssize_t n = write(fd, ((char *)buf) + written, count - written); if (n == -1) { if (errno == EINTR || errno == EAGAIN) continue; @@ -86,7 +86,7 @@ ssize_t writeall_nonblock(int fd, const void *buf, size_t count) { size_t written = 0; while (written < count) { - const ssize_t n = write(fd, buf + written, count - written); + const ssize_t n = write(fd, ((char *)buf) + written, count - written); if (n == -1) { if (errno == EAGAIN) { return written; |