misc: fix c11 return handling (#476)

baresip · Aug 25, 2022 · ffa4612 · ffa4612
1 parent 1cebc84
commit ffa4612
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/src/jbuf/jbuf.c b/src/jbuf/jbuf.c
@@ -188,8 +188,8 @@ int jbuf_alloc(struct jbuf **jbp, uint32_t min, uint32_t max)
 	DEBUG_INFO("alloc: delay=%u-%u frames\n", min, max);
 
 	jb->pt = -1;
-	err = mtx_init(&jb->lock, mtx_plain);
-	if (err != thrd_success) {
+	err = mtx_init(&jb->lock, mtx_plain) != thrd_success;
+	if (err) {
 		err = ENOMEM;
 		goto out;
 	}

diff --git a/src/main/main.c b/src/main/main.c
@@ -182,8 +182,8 @@ static void re_once(void)
 {
 	int err;
 
-	err = tss_create(&key, thread_destructor);
-	if (err != thrd_success) {
+	err = tss_create(&key, thread_destructor) != thrd_success;
+	if (err) {
 		DEBUG_WARNING("tss_create failed\n");
 		exit(ENOMEM);
 	}
@@ -214,8 +214,8 @@ static inline void re_lock(struct re *re)
 {
 	int err;
 
-	err = mtx_lock(re->mutexp);
-	if (err != thrd_success)
+	err = mtx_lock(re->mutexp) != thrd_success;
+	if (err)
 		DEBUG_WARNING("re_lock err\n");
 }
 
@@ -224,8 +224,8 @@ static inline void re_unlock(struct re *re)
 {
 	int err;
 
-	err = mtx_unlock(re->mutexp);
-	if (err != thrd_success)
+	err = mtx_unlock(re->mutexp) != thrd_success;
+	if (err)
 		DEBUG_WARNING("re_unlock err\n");
 }
 
@@ -1291,8 +1291,8 @@ int re_thread_init(void)
 	if (!re_global)
 		re_global = re;
 
-	err = tss_set(key, re);
-	if (err != thrd_success) {
+	err = tss_set(key, re) != thrd_success;
+	if (err) {
 		err = ENOMEM;
 		DEBUG_WARNING("thread_init: tss_set error\n");
 	}

diff --git a/src/thread/thread.c b/src/thread/thread.c
@@ -23,8 +23,8 @@ int mutex_alloc(mtx_t **mtx)
 	if (!m)
 		return ENOMEM;
 
-	err = mtx_init(m, mtx_plain);
-	if (err != thrd_success) {
+	err = mtx_init(m, mtx_plain) != thrd_success;
+	if (err) {
 		err = ENOMEM;
 		goto out;
 	}
@@ -44,17 +44,17 @@ int mutex_alloc(mtx_t **mtx)
 int thread_create_name(thrd_t *thr, const char *name, thrd_start_t func,
 		     void *arg)
 {
-	int err;
+	int ret;
 	(void)name;
 
 	if (!thr || !func)
 		return EINVAL;
 
-	err = thrd_create(thr, func, arg);
-	if (err == thrd_success)
+	ret = thrd_create(thr, func, arg);
+	if (ret == thrd_success)
 		return 0;
 
-	if (err == thrd_nomem)
+	if (ret == thrd_nomem)
 		return ENOMEM;
 
 	return EAGAIN;

diff --git a/src/trace/trace.c b/src/trace/trace.c
@@ -115,8 +115,8 @@ int re_trace_init(const char *json_file)
 		return ENOMEM;
 	}
 
-	err = mtx_init(&trace.lock, mtx_plain);
-	if (err != thrd_success) {
+	err = mtx_init(&trace.lock, mtx_plain) != thrd_success;
+	if (err) {
 		err = ENOMEM;
 		goto out;
 	}