www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

back out APR_ prefix for TRUE,FALSE

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85081 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Doug MacEachern
2000-04-28 18:27:55 +00:00
parent 6bb2ecf9c8
commit 2f45db7e82
8 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
modules/arch/win32/mod_isapi.c
View File

@@ -348,15 +348,15 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
if (strlen(result) > *lpdwSizeofBuffer) { if (strlen(result) > *lpdwSizeofBuffer) {
*lpdwSizeofBuffer = strlen(result); *lpdwSizeofBuffer = strlen(result);
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
return APR_FALSE; return FALSE;
} }
strncpy(lpvBuffer, result, *lpdwSizeofBuffer); strncpy(lpvBuffer, result, *lpdwSizeofBuffer);
return APR_TRUE; return TRUE;
} }
/* Didn't find it */ /* Didn't find it */
SetLastError(ERROR_INVALID_INDEX); SetLastError(ERROR_INVALID_INDEX);
return APR_FALSE; return FALSE;
} }
BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes, BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
@@ -370,22 +370,22 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r, ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r,
"ISAPI asynchronous I/O not supported: %s", r->filename); "ISAPI asynchronous I/O not supported: %s", r->filename);
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return APR_FALSE; return FALSE;
} }
if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) { if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) {
SetLastError(WSAEDISCON); /* TODO: Find the right error code */ SetLastError(WSAEDISCON); /* TODO: Find the right error code */
return APR_FALSE; return FALSE;
} }
*lpwdwBytes = writ; *lpwdwBytes = writ;
return APR_TRUE; return TRUE;
} }
BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize) BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
{ {
/* Doesn't need to do anything; we've read all the data already */ /* Doesn't need to do anything; we've read all the data already */
return APR_TRUE; return TRUE;
} }
/* XXX: There is an O(n^2) attack possible here. */ /* XXX: There is an O(n^2) attack possible here. */
@@ -404,7 +404,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
*/ */
ap_table_set (r->headers_out, "Location", lpvBuffer); ap_table_set (r->headers_out, "Location", lpvBuffer);
cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT; cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT;
return APR_TRUE; return TRUE;
case HSE_REQ_SEND_URL: case HSE_REQ_SEND_URL:
/* Read any additional input */ /* Read any additional input */
@@ -423,7 +423,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
ap_table_unset(r->headers_in, "Content-Length"); ap_table_unset(r->headers_in, "Content-Length");
ap_internal_redirect((char *)lpvBuffer, r); ap_internal_redirect((char *)lpvBuffer, r);
return APR_TRUE; return TRUE;
case HSE_REQ_SEND_RESPONSE_HEADER: case HSE_REQ_SEND_RESPONSE_HEADER:
r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK"); r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
@@ -439,7 +439,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
*/ */
if (!lpdwDataType) { if (!lpdwDataType) {
ap_send_http_header(r); ap_send_http_header(r);
return APR_TRUE; return TRUE;
} }
/* Make a copy - don't disturb the original */ /* Make a copy - don't disturb the original */
@@ -458,7 +458,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
ap_log_rerror(APLOG_MARK, APLOG_ERR, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
"ISA sent invalid headers: %s", r->filename); "ISA sent invalid headers: %s", r->filename);
SetLastError(TODO_ERROR); SetLastError(TODO_ERROR);
return APR_FALSE; return FALSE;
} }
/* Get rid of \n and \r */ /* Get rid of \n and \r */
@@ -480,7 +480,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
SetLastError(TODO_ERROR); SetLastError(TODO_ERROR);
ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r,
"ISA sent invalid headers", r->filename); "ISA sent invalid headers", r->filename);
return APR_FALSE; return FALSE;
} }
*value++ = '\0'; *value++ = '\0';
@@ -532,7 +532,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
/* Any data left should now be sent directly */ /* Any data left should now be sent directly */
ap_rputs(data, r); ap_rputs(data, r);
return APR_TRUE; return TRUE;
case HSE_REQ_MAP_URL_TO_PATH: case HSE_REQ_MAP_URL_TO_PATH:
/* Map a URL to a filename */ /* Map a URL to a filename */
@@ -550,13 +550,13 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
((char *)lpvBuffer)[l + 1] = '\0'; ((char *)lpvBuffer)[l + 1] = '\0';
} }
return APR_TRUE; return TRUE;
case HSE_REQ_DONE_WITH_SESSION: case HSE_REQ_DONE_WITH_SESSION:
/* Do nothing... since we don't support async I/O, they'll /* Do nothing... since we don't support async I/O, they'll
* return from HttpExtensionProc soon * return from HttpExtensionProc soon
*/ */
return APR_TRUE; return TRUE;
/* We don't support all this async I/O, Microsoft-specific stuff */ /* We don't support all this async I/O, Microsoft-specific stuff */
case HSE_REQ_IO_COMPLETION: case HSE_REQ_IO_COMPLETION:
@@ -565,7 +565,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
"ISAPI asynchronous I/O not supported: %s", r->filename); "ISAPI asynchronous I/O not supported: %s", r->filename);
default: default:
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return APR_FALSE; return FALSE;
} }
} }

2
modules/experimental/mod_example.c
View File

@@ -775,7 +775,7 @@ static void *example_merge_dir_config(ap_pool_t *p, void *parent_conf,
merged_config->loc = ap_pstrdup(p, nconf->loc); merged_config->loc = ap_pstrdup(p, nconf->loc);
/* /*
* Others, like the setting of the `congenital' flag, get ORed in. The * Others, like the setting of the `congenital' flag, get ORed in. The
* setting of that particular flag, for instance, is APR_TRUE if it was ever * setting of that particular flag, for instance, is TRUE if it was ever
* true anywhere in the upstream configuration. * true anywhere in the upstream configuration.
*/ */
merged_config->congenital = (pconf->congenital | pconf->local); merged_config->congenital = (pconf->congenital | pconf->local);

10
modules/mappers/mod_rewrite.h
View File

@@ -197,14 +197,14 @@
#define CACHE_TLB_ROWS 1024 #define CACHE_TLB_ROWS 1024
#define CACHE_TLB_COLS 4 #define CACHE_TLB_COLS 4
#ifndef APR_FALSE #ifndef FALSE
#define APR_FALSE 0 #define FALSE 0
#define APR_TRUE !APR_FALSE #define TRUE !FALSE
#endif #endif
#ifndef NO #ifndef NO
#define NO APR_FALSE #define NO FALSE
#define YES APR_TRUE #define YES TRUE
#endif #endif
#ifndef RAND_MAX #ifndef RAND_MAX

16
modules/proxy/proxy_util.c
View File

@@ -906,7 +906,7 @@ static const char *
return host; /* ought to return the port, too */ return host; /* ought to return the port, too */
} }
/* Return APR_TRUE if addr represents an IP address (or an IP network address) */ /* Return TRUE if addr represents an IP address (or an IP network address) */
int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p) int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p)
{ {
const char *addr = This->name; const char *addr = This->name;
@@ -1010,7 +1010,7 @@ int ap_proxy_is_ipaddr(struct dirconn_entry *This, ap_pool_t *p)
return (*addr == '\0'); /* okay iff we've parsed the whole string */ return (*addr == '\0'); /* okay iff we've parsed the whole string */
} }
/* Return APR_TRUE if addr represents an IP address (or an IP network address) */ /* Return TRUE if addr represents an IP address (or an IP network address) */
static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r) static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r)
{ {
int i; int i;
@@ -1102,7 +1102,7 @@ static int proxy_match_ipaddr(struct dirconn_entry *This, request_rec *r)
return 0; return 0;
} }
/* Return APR_TRUE if addr represents a domain name */ /* Return TRUE if addr represents a domain name */
int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p) int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p)
{ {
char *addr = This->name; char *addr = This->name;
@@ -1135,7 +1135,7 @@ int ap_proxy_is_domainname(struct dirconn_entry *This, ap_pool_t *p)
return 1; return 1;
} }
/* Return APR_TRUE if host "host" is in domain "domain" */ /* Return TRUE if host "host" is in domain "domain" */
static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r) static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r)
{ {
const char *host = proxy_get_host_of_request(r); const char *host = proxy_get_host_of_request(r);
@@ -1156,7 +1156,7 @@ static int proxy_match_domainname(struct dirconn_entry *This, request_rec *r)
&& strncasecmp(&host[h_len - d_len], This->name, d_len) == 0; && strncasecmp(&host[h_len - d_len], This->name, d_len) == 0;
} }
/* Return APR_TRUE if addr represents a host name */ /* Return TRUE if addr represents a host name */
int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p) int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p)
{ {
struct hostent host; struct hostent host;
@@ -1191,7 +1191,7 @@ int ap_proxy_is_hostname(struct dirconn_entry *This, ap_pool_t *p)
return 1; return 1;
} }
/* Return APR_TRUE if host "host" is equal to host2 "host2" */ /* Return TRUE if host "host" is equal to host2 "host2" */
static int proxy_match_hostname(struct dirconn_entry *This, request_rec *r) static int proxy_match_hostname(struct dirconn_entry *This, request_rec *r)
{ {
char *host = This->name; char *host = This->name;
@@ -1223,14 +1223,14 @@ static int proxy_match_hostname(struct dirconn_entry *This, request_rec *r)
&& strncasecmp(host, host2, h1_len) == 0; && strncasecmp(host, host2, h1_len) == 0;
} }
/* Return APR_TRUE if addr is to be matched as a word */ /* Return TRUE if addr is to be matched as a word */
int ap_proxy_is_word(struct dirconn_entry *This, ap_pool_t *p) int ap_proxy_is_word(struct dirconn_entry *This, ap_pool_t *p)
{ {
This->matcher = proxy_match_word; This->matcher = proxy_match_word;
return 1; return 1;
} }
/* Return APR_TRUE if string "str2" occurs literally in "str1" */ /* Return TRUE if string "str2" occurs literally in "str1" */
static int proxy_match_word(struct dirconn_entry *This, request_rec *r) static int proxy_match_word(struct dirconn_entry *This, request_rec *r)
{ {
const char *host = proxy_get_host_of_request(r); const char *host = proxy_get_host_of_request(r);

32
os/win32/mod_isapi.c
View File

@@ -348,15 +348,15 @@ BOOL WINAPI GetServerVariable (HCONN hConn, LPSTR lpszVariableName,
if (strlen(result) > *lpdwSizeofBuffer) { if (strlen(result) > *lpdwSizeofBuffer) {
*lpdwSizeofBuffer = strlen(result); *lpdwSizeofBuffer = strlen(result);
SetLastError(ERROR_INSUFFICIENT_BUFFER); SetLastError(ERROR_INSUFFICIENT_BUFFER);
return APR_FALSE; return FALSE;
} }
strncpy(lpvBuffer, result, *lpdwSizeofBuffer); strncpy(lpvBuffer, result, *lpdwSizeofBuffer);
return APR_TRUE; return TRUE;
} }
/* Didn't find it */ /* Didn't find it */
SetLastError(ERROR_INVALID_INDEX); SetLastError(ERROR_INVALID_INDEX);
return APR_FALSE; return FALSE;
} }
BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes, BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
@@ -370,22 +370,22 @@ BOOL WINAPI WriteClient (HCONN ConnID, LPVOID Buffer, LPDWORD lpwdwBytes,
ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r, ap_log_rerror(APLOG_MARK, APLOG_WARNING, ERROR_INVALID_PARAMETER, r,
"ISAPI asynchronous I/O not supported: %s", r->filename); "ISAPI asynchronous I/O not supported: %s", r->filename);
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return APR_FALSE; return FALSE;
} }
if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) { if ((writ = ap_rwrite(Buffer, *lpwdwBytes, r)) == EOF) {
SetLastError(WSAEDISCON); /* TODO: Find the right error code */ SetLastError(WSAEDISCON); /* TODO: Find the right error code */
return APR_FALSE; return FALSE;
} }
*lpwdwBytes = writ; *lpwdwBytes = writ;
return APR_TRUE; return TRUE;
} }
BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize) BOOL WINAPI ReadClient (HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize)
{ {
/* Doesn't need to do anything; we've read all the data already */ /* Doesn't need to do anything; we've read all the data already */
return APR_TRUE; return TRUE;
} }
/* XXX: There is an O(n^2) attack possible here. */ /* XXX: There is an O(n^2) attack possible here. */
@@ -404,7 +404,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
*/ */
ap_table_set (r->headers_out, "Location", lpvBuffer); ap_table_set (r->headers_out, "Location", lpvBuffer);
cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT; cid->status = cid->r->status = cid->ecb->dwHttpStatusCode = REDIRECT;
return APR_TRUE; return TRUE;
case HSE_REQ_SEND_URL: case HSE_REQ_SEND_URL:
/* Read any additional input */ /* Read any additional input */
@@ -423,7 +423,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
ap_table_unset(r->headers_in, "Content-Length"); ap_table_unset(r->headers_in, "Content-Length");
ap_internal_redirect((char *)lpvBuffer, r); ap_internal_redirect((char *)lpvBuffer, r);
return APR_TRUE; return TRUE;
case HSE_REQ_SEND_RESPONSE_HEADER: case HSE_REQ_SEND_RESPONSE_HEADER:
r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK"); r->status_line = lpvBuffer ? lpvBuffer : ap_pstrdup(r->pool, "200 OK");
@@ -439,7 +439,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
*/ */
if (!lpdwDataType) { if (!lpdwDataType) {
ap_send_http_header(r); ap_send_http_header(r);
return APR_TRUE; return TRUE;
} }
/* Make a copy - don't disturb the original */ /* Make a copy - don't disturb the original */
@@ -458,7 +458,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
ap_log_rerror(APLOG_MARK, APLOG_ERR, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, r,
"ISA sent invalid headers: %s", r->filename); "ISA sent invalid headers: %s", r->filename);
SetLastError(TODO_ERROR); SetLastError(TODO_ERROR);
return APR_FALSE; return FALSE;
} }
/* Get rid of \n and \r */ /* Get rid of \n and \r */
@@ -480,7 +480,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
SetLastError(TODO_ERROR); SetLastError(TODO_ERROR);
ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r, ap_log_rerror(APLOG_MARK, APLOG_ERR, SERVER_ERROR, r,
"ISA sent invalid headers", r->filename); "ISA sent invalid headers", r->filename);
return APR_FALSE; return FALSE;
} }
*value++ = '\0'; *value++ = '\0';
@@ -532,7 +532,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
/* Any data left should now be sent directly */ /* Any data left should now be sent directly */
ap_rputs(data, r); ap_rputs(data, r);
return APR_TRUE; return TRUE;
case HSE_REQ_MAP_URL_TO_PATH: case HSE_REQ_MAP_URL_TO_PATH:
/* Map a URL to a filename */ /* Map a URL to a filename */
@@ -550,13 +550,13 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
((char *)lpvBuffer)[l + 1] = '\0'; ((char *)lpvBuffer)[l + 1] = '\0';
} }
return APR_TRUE; return TRUE;
case HSE_REQ_DONE_WITH_SESSION: case HSE_REQ_DONE_WITH_SESSION:
/* Do nothing... since we don't support async I/O, they'll /* Do nothing... since we don't support async I/O, they'll
* return from HttpExtensionProc soon * return from HttpExtensionProc soon
*/ */
return APR_TRUE; return TRUE;
/* We don't support all this async I/O, Microsoft-specific stuff */ /* We don't support all this async I/O, Microsoft-specific stuff */
case HSE_REQ_IO_COMPLETION: case HSE_REQ_IO_COMPLETION:
@@ -565,7 +565,7 @@ BOOL WINAPI ServerSupportFunction (HCONN hConn, DWORD dwHSERequest,
"ISAPI asynchronous I/O not supported: %s", r->filename); "ISAPI asynchronous I/O not supported: %s", r->filename);
default: default:
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return APR_FALSE; return FALSE;
} }
} }

20
os/win32/util_win32.c
View File

@@ -65,7 +65,7 @@
#include "httpd.h" #include "httpd.h"
#include "http_log.h" #include "http_log.h"
/* Returns APR_TRUE if the input string is a string /* Returns TRUE if the input string is a string
* of one or more '.' characters. * of one or more '.' characters.
*/ */
static BOOL OnlyDots(char *pString) static BOOL OnlyDots(char *pString)
@@ -73,13 +73,13 @@ static BOOL OnlyDots(char *pString)
char *c; char *c;
if (*pString == '\0') if (*pString == '\0')
return APR_FALSE; return FALSE;
for (c = pString;*c;c++) for (c = pString;*c;c++)
if (*c != '.') if (*c != '.')
return APR_FALSE; return FALSE;
return APR_TRUE; return TRUE;
} }
/* Accepts as input a pathname, and tries to match it to an /* Accepts as input a pathname, and tries to match it to an
@@ -93,8 +93,8 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
char buf[HUGE_STRING_LEN]; char buf[HUGE_STRING_LEN];
char *pInputName; char *pInputName;
char *p, *q; char *p, *q;
BOOL bDone = APR_FALSE; BOOL bDone = FALSE;
BOOL bFileExists = APR_TRUE; BOOL bFileExists = TRUE;
HANDLE hFind; HANDLE hFind;
WIN32_FIND_DATA wfd; WIN32_FIND_DATA wfd;
@@ -119,7 +119,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
/* If all we have is a drive letter, then we are done */ /* If all we have is a drive letter, then we are done */
if (strlen(pInputName) == 2) if (strlen(pInputName) == 2)
bDone = APR_TRUE; bDone = TRUE;
} }
q = p; q = p;
@@ -156,7 +156,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
*p = '\0'; *p = '\0';
if (strchr(q, '*') || strchr(q, '?')) if (strchr(q, '*') || strchr(q, '?'))
bFileExists = APR_FALSE; bFileExists = FALSE;
/* If the path exists so far, call FindFirstFile /* If the path exists so far, call FindFirstFile
* again. However, if this portion of the path contains * again. However, if this portion of the path contains
@@ -169,7 +169,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
hFind = FindFirstFile(pInputName, &wfd); hFind = FindFirstFile(pInputName, &wfd);
if (hFind == INVALID_HANDLE_VALUE) { if (hFind == INVALID_HANDLE_VALUE) {
bFileExists = APR_FALSE; bFileExists = FALSE;
} }
else { else {
FindClose(hFind); FindClose(hFind);
@@ -190,7 +190,7 @@ API_EXPORT(char *) ap_os_systemcase_filename(ap_pool_t *pPool,
p = strchr(p, '\\'); p = strchr(p, '\\');
} }
else { else {
bDone = APR_TRUE; bDone = TRUE;
} }
} }

2
server/mpm/prefork/prefork.c
View File

@@ -691,7 +691,7 @@ static void accept_mutex_child_init(ap_pool_t *p)
*/ */
static void accept_mutex_init(ap_pool_t *p) static void accept_mutex_init(ap_pool_t *p)
{ {
int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, APR_FALSE); int rc = DosCreateMutexSem(NULL, &lock_sem, DC_SEM_SHARED, FALSE);
if (rc != 0) { if (rc != 0) {
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, server_conf, ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, server_conf,

22
server/mpm/winnt/service.c
View File

@@ -404,9 +404,9 @@ void RemoveService(char *display_name)
BOOL isProcessService() { BOOL isProcessService() {
if( !AllocConsole() ) if( !AllocConsole() )
return APR_FALSE; return FALSE;
FreeConsole(); FreeConsole();
return APR_TRUE; return TRUE;
} }
/* Determine is service_name is a valid service /* Determine is service_name is a valid service
@@ -423,13 +423,13 @@ BOOL isValidService(char *display_name) {
if (!(schSCM = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS))) { if (!(schSCM = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS))) {
ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL, ap_log_error(APLOG_MARK, APLOG_ERR, GetLastError(), NULL,
"OpenSCManager failed"); "OpenSCManager failed");
return APR_FALSE; return FALSE;
} }
if ((schSVC = OpenService(schSCM, service_name, SERVICE_ALL_ACCESS))) { if ((schSVC = OpenService(schSCM, service_name, SERVICE_ALL_ACCESS))) {
CloseServiceHandle(schSVC); CloseServiceHandle(schSVC);
CloseServiceHandle(schSCM); CloseServiceHandle(schSCM);
return APR_TRUE; return TRUE;
} }
Err = GetLastError(); Err = GetLastError();
@@ -437,14 +437,14 @@ BOOL isValidService(char *display_name) {
ap_log_error(APLOG_MARK, APLOG_ERR, Err, NULL, ap_log_error(APLOG_MARK, APLOG_ERR, Err, NULL,
"OpenService failed"); "OpenService failed");
return APR_FALSE; return FALSE;
} }
int send_signal_to_service(char *display_name, char *sig) { int send_signal_to_service(char *display_name, char *sig) {
SC_HANDLE schService; SC_HANDLE schService;
SC_HANDLE schSCManager; SC_HANDLE schSCManager;
char service_name[256]; char service_name[256];
int success = APR_FALSE; int success = FALSE;
enum { start, restart, stop, unknown } action; enum { start, restart, stop, unknown } action;
static char *param[] = { "start", "restart", "shutdown" }; static char *param[] = { "start", "restart", "shutdown" };
@@ -457,7 +457,7 @@ int send_signal_to_service(char *display_name, char *sig) {
if (action == unknown) { if (action == unknown) {
printf("signal must be start, restart, or shutdown\n"); printf("signal must be start, restart, or shutdown\n");
return APR_FALSE; return FALSE;
} }
/* Remove spaces from display name to create service name */ /* Remove spaces from display name to create service name */
@@ -525,8 +525,8 @@ int ap_stop_service(SC_HANDLE schService)
} }
if (QueryServiceStatus(schService, &globdat.ssStatus)) if (QueryServiceStatus(schService, &globdat.ssStatus))
if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED) if (globdat.ssStatus.dwCurrentState == SERVICE_STOPPED)
return APR_TRUE; return TRUE;
return APR_FALSE; return FALSE;
} }
int ap_start_service(SC_HANDLE schService) { int ap_start_service(SC_HANDLE schService) {
@@ -541,8 +541,8 @@ int ap_start_service(SC_HANDLE schService) {
} }
if (QueryServiceStatus(schService, &globdat.ssStatus)) if (QueryServiceStatus(schService, &globdat.ssStatus))
if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING) if (globdat.ssStatus.dwCurrentState == SERVICE_RUNNING)
return APR_TRUE; return TRUE;
return APR_FALSE; return FALSE;
} }
#endif /* WIN32 */ #endif /* WIN32 */