Fixup a few items spotted by a static code checker

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/mutex.c b/mutex.c
index bbbcccbd0587a7139b247ac4eb38350337fcd912..3a01f98fca5273bd68cb62d7b85b3d3f4e5d84f4 100644 (file)
--- a/mutex.c
+++ b/mutex.c
@@ -23,7 +23,7 @@ struct fio_mutex *fio_mutex_init(int value)
        struct fio_mutex *mutex = NULL;
        pthread_mutexattr_t attr;
        pthread_condattr_t cond;
        struct fio_mutex *mutex = NULL;
        pthread_mutexattr_t attr;
        pthread_condattr_t cond;

-       int ret, mflag;
+       int ret;

 
        mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
                                PROT_READ | PROT_WRITE,
 
        mutex = (void *) mmap(NULL, sizeof(struct fio_mutex),
                                PROT_READ | PROT_WRITE,


@@ -36,22 +36,17 @@ struct fio_mutex *fio_mutex_init(int value)
 
        mutex->value = value;
 
 
        mutex->value = value;
 

-       /*
-        * Not all platforms support process shared mutexes (FreeBSD)
-        */
-#ifdef FIO_HAVE_PSHARED_MUTEX
-       mflag = PTHREAD_PROCESS_SHARED;
-#else
-       mflag = PTHREAD_PROCESS_PRIVATE;
-#endif
-

        ret = pthread_mutexattr_init(&attr);
        if (ret) {
                log_err("pthread_mutexattr_init: %s\n", strerror(ret));
                goto err;
        }
        ret = pthread_mutexattr_init(&attr);
        if (ret) {
                log_err("pthread_mutexattr_init: %s\n", strerror(ret));
                goto err;
        }

+
+       /*
+        * Not all platforms support process shared mutexes (FreeBSD)
+        */

 #ifdef FIO_HAVE_PSHARED_MUTEX
 #ifdef FIO_HAVE_PSHARED_MUTEX

-       ret = pthread_mutexattr_setpshared(&attr, mflag);
+       ret = pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);

        if (ret) {
                log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
                goto err;
        if (ret) {
                log_err("pthread_mutexattr_setpshared: %s\n", strerror(ret));
                goto err;


@@ -60,7 +55,7 @@ struct fio_mutex *fio_mutex_init(int value)
 
        pthread_condattr_init(&cond);
 #ifdef FIO_HAVE_PSHARED_MUTEX
 
        pthread_condattr_init(&cond);
 #ifdef FIO_HAVE_PSHARED_MUTEX

-       pthread_condattr_setpshared(&cond, mflag);
+       pthread_condattr_setpshared(&cond, PTHREAD_PROCESS_SHARED);

 #endif
        pthread_cond_init(&mutex->cond, &cond);
 
 #endif
        pthread_cond_init(&mutex->cond, &cond);
 

diff --git a/os/os-solaris.h b/os/os-solaris.h
index 5bf868ac8f527c3ed56c130ee633d12b5ab3b693..c6a46ee092070c4af1284846ee67a8da0cc59aec 100644 (file)
--- a/os/os-solaris.h
+++ b/os/os-solaris.h
@@ -111,24 +111,16 @@ static inline int fio_set_odirect(int fd)
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)
 {
 
 static inline int fio_cpuset_init(os_cpu_mask_t *mask)
 {

-       int ret;
-
-       if (pset_create(mask) < 0) {
-               ret = errno;
+       if (pset_create(mask) < 0)

                return -1;
                return -1;

-       }

 
        return 0;
 }
 
 static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 {
 
        return 0;
 }
 
 static inline int fio_cpuset_exit(os_cpu_mask_t *mask)
 {

-       int ret;
-
-       if (pset_destroy(*mask) < 0) {
-               ret = errno;
+       if (pset_destroy(*mask) < 0)

                return -1;
                return -1;

-       }

 
        return 0;
 }
 
        return 0;
 }

diff --git a/parse.c b/parse.c
index 8aaf7992754f1de3e42211a1e3b9c1ef05eddb06..6ea7c103c0973a259ec6227355161e5139a63025 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -180,6 +180,7 @@ static unsigned long long __get_mult_bytes(const char *p, void *data,
                pow = 1;
        else if (!strcmp("%", c)) {
                *percent = 1;
                pow = 1;
        else if (!strcmp("%", c)) {
                *percent = 1;

+               free(c);

                return ret;
        }
 
                return ret;
        }