Remove deprecated APR_STATUS_IS_SUCCESS() macro in favor of direct test against

APR_SUCCESS.

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

diff --git a/CHANGES b/CHANGES
index 0099764a404628d3f5706f12a557a4c7178f815d..0fed2403a689af500345a0b941e1abffe44b303b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ Changes with Apache 2.1.0-dev
 
   [Remove entries to the current 2.0 section below, when backported]
 
+  *) Remove deprecated/removed APR_STATUS_IS_SUCCESS().  [Justin Erenkrantz]
+
   *) perchild MPM: Fix thread safety problem in the use of longjmp().
      [Tsuyoshi SASAMOTO <nazonazo super.win.ne.jp>]
 

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 0217a8a3fd65e63d31f28d42062fbfb882dde1b2..ca68b453891c4441f5ec1bef9bfdae9b555aaa4c 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1542,7 +1542,7 @@ static int find_file(request_rec *r, const char *directive, const char *tag,
                                 APR_FILEPATH_SECUREROOTTEST |
                                 APR_FILEPATH_NOTABSOLUTE, r->pool);
 
-        if (!APR_STATUS_IS_SUCCESS(rv)) {
+        if (rv != APR_SUCCESS) {
             error_fmt = "unable to access file \"%s\" "
                         "in parsed file %s";
         }
@@ -1658,7 +1658,7 @@ static apr_status_t handle_include(include_ctx_t *ctx, ap_filter_t *f,
                                     APR_FILEPATH_SECUREROOTTEST |
                                     APR_FILEPATH_NOTABSOLUTE, ctx->dpool);
 
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 error_fmt = "unable to include file \"%s\" in parsed file %s";
             }
             else {
@@ -3143,7 +3143,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
 
             if (!APR_BRIGADE_EMPTY(pass_bb)) {
                 rv = ap_pass_brigade(f->next, pass_bb);
-                if (!APR_STATUS_IS_SUCCESS(rv)) {
+                if (rv != APR_SUCCESS) {
                     apr_brigade_destroy(pass_bb);
                     return rv;
                 }
@@ -3164,11 +3164,11 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
                 }
             }
 
-            if (!len || !APR_STATUS_IS_SUCCESS(rv)) {
+            if (!len || rv != APR_SUCCESS) {
                 rv = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);
             }
 
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 apr_brigade_destroy(pass_bb);
                 return rv;
             }
@@ -3382,7 +3382,7 @@ static apr_status_t send_parsed_content(ap_filter_t *f, apr_bucket_brigade *bb)
                 if (handle_func) {
                     DEBUG_INIT(ctx, f, pass_bb);
                     rv = handle_func(ctx, f, pass_bb);
-                    if (!APR_STATUS_IS_SUCCESS(rv)) {
+                    if (rv != APR_SUCCESS) {
                         apr_brigade_destroy(pass_bb);
                         return rv;
                     }

diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index 5e93272027df2562a6e3899698fdd962b859999c..bfb0a551bff7fdf6686ded0b52b582b33a481c44 100644 (file)
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -1134,7 +1134,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f,
                        SSI_EXPAND_LEAVE_NAME);
 
             rv = include_cmd(ctx, f, bb, parsed_string);
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "execution failure "
                               "for parameter \"%s\" to tag exec in file %s",
                               tag, r->filename);
@@ -1149,7 +1149,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f,
                        SSI_EXPAND_DROP_NAME);
 
             rv = include_cgi(ctx, f, bb, parsed_string);
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid CGI ref "
                               "\"%s\" in %s", tag_val, file);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);

diff --git a/modules/generators/mod_cgid.c b/modules/generators/mod_cgid.c
index cf955cc51617c8f828f142c57dc9a3e2aa4cd686..218d8dd1428c4fca4c6a15b81b4f27974b8caa5b 100644 (file)
--- a/modules/generators/mod_cgid.c
+++ b/modules/generators/mod_cgid.c
@@ -1045,7 +1045,7 @@ static int log_script(request_rec *r, cgid_server_conf * conf, int ret,
             break;
         }
         rv = apr_bucket_read(e, &buf, &len, APR_BLOCK_READ);
-        if (!APR_STATUS_IS_SUCCESS(rv) || (len == 0)) {
+        if (rv != APR_SUCCESS || (len == 0)) {
             break;
         }
         if (first) {
@@ -1150,7 +1150,7 @@ static void discard_script_output(apr_bucket_brigade *bb)
             break;
         }
         rv = apr_bucket_read(e, &buf, &len, APR_BLOCK_READ);
-        if (!APR_STATUS_IS_SUCCESS(rv)) {
+        if (rv != APR_SUCCESS) {
             break;
         }
     }
@@ -1707,7 +1707,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f,
                         SSI_EXPAND_LEAVE_NAME);
 
             rv = include_cmd(ctx, f, bb, parsed_string);
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
                               "execution failure for parameter \"%s\" "
                               "to tag exec in file %s", tag, r->filename);
@@ -1722,7 +1722,7 @@ static apr_status_t handle_exec(include_ctx_t *ctx, ap_filter_t *f,
                         SSI_EXPAND_DROP_NAME);
 
             rv = include_cgi(ctx, f, bb, parsed_string);
-            if (!APR_STATUS_IS_SUCCESS(rv)) {
+            if (rv != APR_SUCCESS) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r, "invalid CGI ref "
                               "\"%s\" in %s", tag_val, file);
                 SSI_CREATE_ERROR_BUCKET(ctx, f, bb);

diff --git a/server/util_script.c b/server/util_script.c
index 922450c5cf0557bec0162a4aa69c078f78dba94e..f7788926b301996720be6c36b7ca95a926e46d4e 100644 (file)
--- a/server/util_script.c
+++ b/server/util_script.c
@@ -610,7 +610,7 @@ static int getsfunc_BRIGADE(char *buf, int len, void *arg)
 
         rv = apr_bucket_read(e, &bucket_data, &bucket_data_len,
                              APR_BLOCK_READ);
-        if (!APR_STATUS_IS_SUCCESS(rv) || (bucket_data_len == 0)) {
+        if (rv != APR_SUCCESS || (bucket_data_len == 0)) {
             return 0;
         }
         src = bucket_data;

diff --git a/server/util_time.c b/server/util_time.c
index 0235af7095a4062b9a78a920a09ba0cdf0756484..42d1db751e2abc1d077b5680ddeeb007ed080316 100644 (file)
--- a/server/util_time.c
+++ b/server/util_time.c
@@ -118,7 +118,7 @@ static apr_status_t cached_explode(apr_time_exp_t *xt, apr_time_t t,
         else {
             r = apr_time_exp_lt(xt, t);
         }
-        if (!APR_STATUS_IS_SUCCESS(r)) {
+        if (r != APR_SUCCESS) {
             return r;
         }
         cache_element->t = seconds;