[apr] Fix dead nested assignments

diff --git a/libs/apr/locks/unix/proc_mutex.c b/libs/apr/locks/unix/proc_mutex.c
index 26b2f9029a073d2053a18d07ddede6e05b020686..579bb8af4d037902003810cb432726a84c44dcaf 100644 (file)
--- a/libs/apr/locks/unix/proc_mutex.c
+++ b/libs/apr/locks/unix/proc_mutex.c
@@ -730,10 +730,9 @@ static apr_status_t proc_mutex_choose_method(apr_proc_mutex_t *new_mutex, apr_lo
 
 APR_DECLARE(const char *) apr_proc_mutex_defname(void)
 {
-    apr_status_t rv;
     apr_proc_mutex_t mutex;
 
-    if ((rv = proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT)) != APR_SUCCESS) {
+    if (proc_mutex_choose_method(&mutex, APR_LOCK_DEFAULT) != APR_SUCCESS) {
         return "unknown";
     }
     mutex.meth = mutex.inter_meth;

diff --git a/libs/apr/memory/unix/apr_pools.c b/libs/apr/memory/unix/apr_pools.c
index 7e37a5d0a079ef2b6afef5b02be4aa1002141c97..acd8512ca187b7d810b7cd500aa6786aa5678fa0 100644 (file)
--- a/libs/apr/memory/unix/apr_pools.c
+++ b/libs/apr/memory/unix/apr_pools.c
@@ -1005,7 +1005,7 @@ APR_DECLARE(char *) apr_pvsprintf(apr_pool_t *pool, const char *fmt, va_list ap)
        if (pool->user_mutex) apr_thread_mutex_lock(pool->user_mutex);
 #endif
 
-    ps.node = active = pool->active;
+    ps.node = pool->active;
     ps.pool = pool;
     ps.vbuff.curpos  = ps.node->first_avail;
 

diff --git a/libs/apr/strings/apr_snprintf.c b/libs/apr/strings/apr_snprintf.c
index 611f2d7972b2686165b7ac9f0a4041bb34275f14..8c5030d725fe612c6b4abd92476c2c3310d5bab9 100644 (file)
--- a/libs/apr/strings/apr_snprintf.c
+++ b/libs/apr/strings/apr_snprintf.c
@@ -1069,7 +1069,7 @@ APR_DECLARE(int) apr_vformatter(int (*flush_func)(apr_vformatter_buff_t *),
 
                 s_len = strlen(s);
 
-                if (alternate_form && (q = strchr(s, '.')) == NULL) {
+                if (alternate_form && strchr(s, '.') == NULL) {
                     s[s_len++] = '.';
                     s[s_len] = '\0'; /* delimit for following strchr() */
                 }

diff --git a/libs/apr/threadproc/unix/proc.c b/libs/apr/threadproc/unix/proc.c
index 0f3437aee01d4e105308de1197689ee9780a0c91..fc7f925eb4d2f45be39ca8d3b69dfa4cbfff4eef 100644 (file)
--- a/libs/apr/threadproc/unix/proc.c
+++ b/libs/apr/threadproc/unix/proc.c
@@ -369,7 +369,6 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
         return errno;
     }
     else if (new->pid == 0) {
-        int status;
         /* child process */
 
         /*
@@ -433,7 +432,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
 
         /* Only try to switch if we are running as root */
         if (attr->gid != -1 && !geteuid()) {
-            if ((status = setgid(attr->gid))) {
+            if (setgid(attr->gid)) {
                 if (attr->errfn) {
                     attr->errfn(pool, errno, "setting of group failed");
                 }
@@ -442,7 +441,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
         }
 
         if (attr->uid != -1 && !geteuid()) {
-            if ((status = setuid(attr->uid))) {
+            if (setuid(attr->uid)) {
                 if (attr->errfn) {
                     attr->errfn(pool, errno, "setting of user failed");
                 }
@@ -450,7 +449,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
             }
         }
 
-        if ((status = limit_proc(attr)) != APR_SUCCESS) {
+        if (limit_proc(attr) != APR_SUCCESS) {
             if (attr->errfn) {
                 attr->errfn(pool, errno, "setting of resource limits failed");
             }