[apr-util] Fix issues reported by scan-build.

diff --git a/libs/apr-util/hooks/apr_hooks.c b/libs/apr-util/hooks/apr_hooks.c
index da0ae970581526dfa4cc8f3de626d934c2ac391e..776bc884e74eea35169ba4559baa035323b764c3 100644 (file)
--- a/libs/apr-util/hooks/apr_hooks.c
+++ b/libs/apr-util/hooks/apr_hooks.c
@@ -180,7 +180,9 @@ static TSort *tsort(TSort *pData,int nItems)
                    break;
                }
     }
-    pTail->pNext=NULL;  /* unfudge the tail */
+       if (pTail) {
+               pTail->pNext = NULL;  /* unfudge the tail */
+       }
     return pHead;
 }
 

diff --git a/libs/apr-util/misc/apr_queue.c b/libs/apr-util/misc/apr_queue.c
index e905a53ebba4a6c97a2211d6f790d86b47bc6a84..a947df8a089a39c120740b679037c47388b9a5a7 100644 (file)
--- a/libs/apr-util/misc/apr_queue.c
+++ b/libs/apr-util/misc/apr_queue.c
@@ -222,7 +222,7 @@ APU_DECLARE(apr_status_t) apr_queue_trypush(apr_queue_t *queue, void *data)
     }
 
     if (apr_queue_full(queue)) {
-        rv = apr_thread_mutex_unlock(queue->one_big_mutex);
+        apr_thread_mutex_unlock(queue->one_big_mutex);
         return APR_EAGAIN;
     }
     
@@ -397,7 +397,7 @@ APU_DECLARE(apr_status_t) apr_queue_trypop(apr_queue_t *queue, void **data)
     }
 
     if (apr_queue_empty(queue)) {
-        rv = apr_thread_mutex_unlock(queue->one_big_mutex);
+        apr_thread_mutex_unlock(queue->one_big_mutex);
         return APR_EAGAIN;
     } 
 

diff --git a/libs/apr-util/xml/apr_xml.c b/libs/apr-util/xml/apr_xml.c
index 73543555ff800ced98d133e83753884ab0c72fe9..a05348d60f523a4362ce8e713044f8bb0e314a08 100644 (file)
--- a/libs/apr-util/xml/apr_xml.c
+++ b/libs/apr-util/xml/apr_xml.c
@@ -82,7 +82,7 @@ static int find_prefix(apr_xml_parser *parser, const char *prefix)
     ** prefix.
     */
     for (; elem; elem = elem->parent) {
-       apr_xml_ns_scope *ns_scope = elem->ns_scope;
+       apr_xml_ns_scope *ns_scope;
 
        for (ns_scope = elem->ns_scope; ns_scope; ns_scope = ns_scope->next) {
            if (strcmp(prefix, ns_scope->prefix) == 0) {