You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2004/08/01 03:12:30 UTC
cvs commit: httpd-2.0/server util_script.c util_time.c
jerenkrantz 2004/07/31 18:12:30
Modified: . CHANGES
modules/filters mod_include.c
modules/generators mod_cgi.c mod_cgid.c
server util_script.c util_time.c
Log:
Remove deprecated APR_STATUS_IS_SUCCESS() macro in favor of direct test against
APR_SUCCESS.
Revision Changes Path
1.1543 +2 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1542
retrieving revision 1.1543
diff -u -u -r1.1542 -r1.1543
--- CHANGES 31 Jul 2004 20:47:48 -0000 1.1542
+++ CHANGES 1 Aug 2004 01:12:29 -0000 1.1543
@@ -2,6 +2,8 @@
[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>]
1.301 +6 -6 httpd-2.0/modules/filters/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/filters/mod_include.c,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -u -r1.300 -r1.301
--- mod_include.c 15 Jun 2004 20:49:46 -0000 1.300
+++ mod_include.c 1 Aug 2004 01:12:29 -0000 1.301
@@ -1542,7 +1542,7 @@
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 @@
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 @@
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 @@
}
}
- 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 @@
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;
}
1.167 +2 -2 httpd-2.0/modules/generators/mod_cgi.c
Index: mod_cgi.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgi.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -u -r1.166 -r1.167
--- mod_cgi.c 12 Jul 2004 16:53:24 -0000 1.166
+++ mod_cgi.c 1 Aug 2004 01:12:30 -0000 1.167
@@ -1134,7 +1134,7 @@
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 @@
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);
1.170 +4 -4 httpd-2.0/modules/generators/mod_cgid.c
Index: mod_cgid.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/generators/mod_cgid.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -u -r1.169 -r1.170
--- mod_cgid.c 29 Jun 2004 13:48:20 -0000 1.169
+++ mod_cgid.c 1 Aug 2004 01:12:30 -0000 1.170
@@ -1045,7 +1045,7 @@
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 @@
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 @@
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 @@
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);
1.91 +1 -1 httpd-2.0/server/util_script.c
Index: util_script.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_script.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -u -r1.90 -r1.91
--- util_script.c 16 Jun 2004 16:07:43 -0000 1.90
+++ util_script.c 1 Aug 2004 01:12:30 -0000 1.91
@@ -610,7 +610,7 @@
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;
1.16 +1 -1 httpd-2.0/server/util_time.c
Index: util_time.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/util_time.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- util_time.c 9 Feb 2004 20:40:49 -0000 1.15
+++ util_time.c 1 Aug 2004 01:12:30 -0000 1.16
@@ -118,7 +118,7 @@
else {
r = apr_time_exp_lt(xt, t);
}
- if (!APR_STATUS_IS_SUCCESS(r)) {
+ if (r != APR_SUCCESS) {
return r;
}
cache_element->t = seconds;