Merge pull request #3454 from alanbarr/cppcheck_fixes_2

Cppcheck Fixes

diff --git a/libi3/mkdirp.c b/libi3/mkdirp.c
index 1fc8c34607222ad381b269fad2fed20e1ad81bdc..f5281bd74164c5e1268a2cd3f3925ff1a9d28063 100644 (file)
--- 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 04bbda44c8ae233d83a9fea4f0608a2b933e1bd7..1802b327ee4442802cc7acc96dfa67e262a114a6 100644 (file)
--- 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;