summaryrefslogtreecommitdiffstats
path: root/support/htcacheclean.c
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-05-12 00:51:46 +0200
committerStefan Fritsch <sf@apache.org>2011-05-12 00:51:46 +0200
commit61a04137064708b59fe278f5a4ba6a070f503bcc (patch)
tree03c1b31addd8e0d2c1bd2968a911a274a4818d79 /support/htcacheclean.c
parentand bump to 2.3.13 (diff)
downloadapache2-61a04137064708b59fe278f5a4ba6a070f503bcc.tar.xz
apache2-61a04137064708b59fe278f5a4ba6a070f503bcc.zip
Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier to find the problematic cases. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1102124 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/htcacheclean.c')
-rw-r--r--support/htcacheclean.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/support/htcacheclean.c b/support/htcacheclean.c
index 567d0856d7..2e5a7fefaa 100644
--- a/support/htcacheclean.c
+++ b/support/htcacheclean.c
@@ -1083,7 +1083,7 @@ static apr_status_t remove_directory(apr_pool_t *pool, const char *dir)
apr_finfo_t dirent;
rv = apr_dir_open(&dirp, dir, pool);
- if (rv == APR_ENOENT) {
+ if (APR_STATUS_IS_ENOENT(rv)) {
return rv;
}
if (rv != APR_SUCCESS) {
@@ -1193,7 +1193,7 @@ static apr_status_t find_directory(apr_pool_t *pool, const char *base,
remove = apr_pstrcat(pool, base, "/", header, NULL);
status = apr_file_remove(remove, pool);
- if (status != APR_SUCCESS && status != APR_ENOENT) {
+ if (status != APR_SUCCESS && !APR_STATUS_IS_ENOENT(status)) {
char errmsg[120];
apr_file_printf(errfile, "Could not remove file %s: %s" APR_EOL_STR,
remove, apr_strerror(status, errmsg, sizeof errmsg));
@@ -1202,7 +1202,7 @@ static apr_status_t find_directory(apr_pool_t *pool, const char *base,
remove = apr_pstrcat(pool, base, "/", data, NULL);
status = apr_file_remove(remove, pool);
- if (status != APR_SUCCESS && status != APR_ENOENT) {
+ if (status != APR_SUCCESS && !APR_STATUS_IS_ENOENT(status)) {
char errmsg[120];
apr_file_printf(errfile, "Could not remove file %s: %s" APR_EOL_STR,
remove, apr_strerror(status, errmsg, sizeof errmsg));
@@ -1210,7 +1210,7 @@ static apr_status_t find_directory(apr_pool_t *pool, const char *base,
}
status = remove_directory(pool, apr_pstrcat(pool, base, "/", vdir, NULL));
- if (status != APR_SUCCESS && status != APR_ENOENT) {
+ if (status != APR_SUCCESS && !APR_STATUS_IS_ENOENT(status)) {
rv = status;
}
}