From: Jeff Trawick <trawick@apache.org>
Date: Sun, 27 Feb 2011 14:38:17 +0000 (+0000)
Subject: axe some useless or debug-inhibiting error checking
X-Git-Tag: 2.3.11~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f63c7450501d026425f8c7c33cca9a5c0bfa674c;p=thirdparty%2Fapache%2Fhttpd.git

axe some useless or debug-inhibiting error checking


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1075064 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/ajp_link.c b/modules/proxy/ajp_link.c
index 2aeb6c9e7ef..56b7c0eac25 100644
--- a/modules/proxy/ajp_link.c
+++ b/modules/proxy/ajp_link.c
@@ -24,12 +24,6 @@ apr_status_t ajp_ilink_send(apr_socket_t *sock, ajp_msg_t *msg)
     apr_status_t status;
     apr_size_t   length;
 
-    if (sock == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_ilink_send(): NULL socket provided");
-        return AJP_EINVAL;
-    }
-
     ajp_msg_end(msg);
 
     length = msg->len;
@@ -83,12 +77,6 @@ apr_status_t ajp_ilink_receive(apr_socket_t *sock, ajp_msg_t *msg)
     apr_size_t   hlen;
     apr_size_t   blen;
 
-    if (sock == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_ilink_receive(): NULL socket provided");
-        return AJP_EINVAL;
-    }
-
     hlen = msg->header_len;
 
     status = ilink_read(sock, msg->buf, hlen);
diff --git a/modules/proxy/ajp_msg.c b/modules/proxy/ajp_msg.c
index 59302960195..b56c2d3f384 100644
--- a/modules/proxy/ajp_msg.c
+++ b/modules/proxy/ajp_msg.c
@@ -506,28 +506,9 @@ apr_status_t ajp_msg_create(apr_pool_t *pool, apr_size_t size, ajp_msg_t **rmsg)
 {
     ajp_msg_t *msg = (ajp_msg_t *)apr_pcalloc(pool, sizeof(ajp_msg_t));
 
-    if (!msg) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_msg_create(): can't allocate AJP message memory");
-        return APR_ENOPOOL;
-    }
-
     msg->server_side = 0;
 
     msg->buf = (apr_byte_t *)apr_palloc(pool, size);
-
-    /* XXX: This should never happen
-     * In case if the OS cannont allocate 8K of data
-     * we are in serious trouble
-     * No need to check the alloc return value, cause the
-     * core dump is probably the best solution anyhow.
-     */
-    if (msg->buf == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                      "ajp_msg_create(): can't allocate AJP message memory");
-        return APR_ENOPOOL;
-    }
-
     msg->len = 0;
     msg->header_len = AJP_HEADER_LEN;
     msg->max_size = size;
@@ -545,12 +526,6 @@ apr_status_t ajp_msg_create(apr_pool_t *pool, apr_size_t size, ajp_msg_t **rmsg)
  */
 apr_status_t ajp_msg_copy(ajp_msg_t *smsg, ajp_msg_t *dmsg)
 {
-    if (dmsg == NULL) {
-        ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
-                     "ajp_msg_copy(): destination msg is null");
-        return AJP_EINVAL;
-    }
-
     if (smsg->len > smsg->max_size) {
         ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
                      "ajp_msg_copy(): destination buffer too "