summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2003-02-09 21:15:55 +0000
committerSascha Schumann <sas@php.net>2003-02-09 21:15:55 +0000
commitba32a619aeda5188a4bf8f04b4df7c3dd6d97bbf (patch)
treebf80c2658929a9fbd837c06a3c684e927a7cc5a1
parent2549b1b638ffe0f279f5f68cee37bc3ae370edcd (diff)
downloadphp-git-ba32a619aeda5188a4bf8f04b4df7c3dd6d97bbf.tar.gz
use SUCCESS/FAILURE instead of 0/-1
-rw-r--r--main/SAPI.c8
-rw-r--r--sapi/apache/mod_php4.c10
-rw-r--r--sapi/thttpd/thttpd.c2
3 files changed, 10 insertions, 10 deletions
diff --git a/main/SAPI.c b/main/SAPI.c
index ed0b0a21f5..8e15573327 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -856,7 +856,7 @@ SAPI_API int sapi_get_fd(int *fd TSRMLS_DC)
if (sapi_module.get_fd) {
return sapi_module.get_fd(fd TSRMLS_CC);
} else {
- return -1;
+ return FAILURE;
}
}
@@ -865,7 +865,7 @@ SAPI_API int sapi_force_http_10(TSRMLS_D)
if (sapi_module.force_http_10) {
return sapi_module.force_http_10(TSRMLS_C);
} else {
- return -1;
+ return FAILURE;
}
}
@@ -875,7 +875,7 @@ SAPI_API int sapi_get_target_uid(uid_t *obj TSRMLS_DC)
if (sapi_module.get_target_uid) {
return sapi_module.get_target_uid(obj TSRMLS_CC);
} else {
- return -1;
+ return FAILURE;
}
}
@@ -884,7 +884,7 @@ SAPI_API int sapi_get_target_gid(gid_t *obj TSRMLS_DC)
if (sapi_module.get_target_gid) {
return sapi_module.get_target_gid(obj TSRMLS_CC);
} else {
- return -1;
+ return FAILURE;
}
}
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index 0803edef4a..9f3d7444dd 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -355,9 +355,9 @@ static int sapi_apache_get_fd(int *nfd TSRMLS_DC)
if (fd >= 0) {
if (nfd) *nfd = fd;
- return 0;
+ return SUCCESS;
}
- return -1;
+ return FAILURE;
}
/* }}} */
@@ -369,7 +369,7 @@ static int sapi_apache_force_http_10(TSRMLS_D)
r->proto_num = HTTP_VERSION(1,0);
- return 0;
+ return SUCCESS;
}
/* {{{ sapi_apache_get_target_uid
@@ -377,7 +377,7 @@ static int sapi_apache_force_http_10(TSRMLS_D)
static int sapi_apache_get_target_uid(uid_t *obj TSRMLS_DC)
{
*obj = ap_user_id;
- return 0;
+ return SUCCESS;
}
/* {{{ sapi_apache_get_target_gid
@@ -385,7 +385,7 @@ static int sapi_apache_get_target_uid(uid_t *obj TSRMLS_DC)
static int sapi_apache_get_target_gid(gid_t *obj TSRMLS_DC)
{
*obj = ap_group_id;
- return 0;
+ return SUCCESS;
}
/* {{{ sapi_module_struct apache_sapi_module
diff --git a/sapi/thttpd/thttpd.c b/sapi/thttpd/thttpd.c
index ae46df3509..30d1cea798 100644
--- a/sapi/thttpd/thttpd.c
+++ b/sapi/thttpd/thttpd.c
@@ -349,7 +349,7 @@ static int php_thttpd_startup(sapi_module_struct *sapi_module)
static int sapi_thttpd_get_fd(int *nfd TSRMLS_DC)
{
if (nfd) *nfd = TG(hc)->conn_fd;
- return 0;
+ return SUCCESS;
}
static sapi_module_struct thttpd_sapi_module = {