randy 97/08/31 21:00:29
Modified: src/os/win32 mod_isapi.c Log: More log_*() conversions to aplog_error(). Revision Changes Path 1.3 +20 -10 apachen/src/os/win32/mod_isapi.c Index: mod_isapi.c =================================================================== RCS file: /export/home/cvs/apachen/src/os/win32/mod_isapi.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mod_isapi.c 1997/08/13 08:37:33 1.2 +++ mod_isapi.c 1997/09/01 04:00:28 1.3 @@ -130,20 +130,23 @@ if (!(isapi_handle = LoadLibraryEx(r->filename, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))) { - log_reason("Could not load DLL", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ALERT, r->server, + "Could not load DLL: %s", r->filename); return SERVER_ERROR; } if (!(isapi_version = (void *)(GetProcAddress(isapi_handle, "GetExtensionVersion")))) { - log_reason("DLL could not load GetExtensionVersion()", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ALERT, r->server, + "DLL could not load GetExtensionVersion(): %s", r->filename); FreeLibrary(isapi_handle); return SERVER_ERROR; } if (!(isapi_entry = (void *)(GetProcAddress(isapi_handle, "HttpExtensionProc")))) { - log_reason("DLL could not load HttpExtensionProc()", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ALERT, r->server, + "DLL could not load HttpExtensionProc(): %s", r->filename); FreeLibrary(isapi_handle); return SERVER_ERROR; } @@ -153,7 +156,8 @@ /* Run GetExtensionVersion() */ if ((*isapi_version)(pVer) != TRUE) { - log_reason("ISAPI GetExtensionVersion() failed", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ALERT, r->server, + "ISAPI GetExtensionVersion() failed: %s", r->filename); FreeLibrary(isapi_handle); return SERVER_ERROR; } @@ -243,7 +247,8 @@ /* Check for a log message - and log it */ if (ecb->lpszLogData && strcmp(ecb->lpszLogData, "")) - log_reason(ecb->lpszLogData, r->filename, r); + aplog_error(APLOG_MARK, APLOG_ERR, r->server, + "%s: %s", ecb->lpszLogData, r->filename); /* All done with the DLL... get rid of it */ if (isapi_term) (*isapi_term)(HSE_TERM_MUST_UNLOAD); @@ -261,7 +266,8 @@ return OK; case HSE_STATUS_PENDING: /* We don't support this */ - log_reason("ISAPI asynchronous I/O not supported", r->filename, r); + aplog_error(APLOG_MARK, APLOG_WARNING, r->server, + "ISAPI asynchronous I/O not supported: %s", r->filename); case HSE_STATUS_ERROR: default: return SERVER_ERROR; @@ -321,7 +327,8 @@ /* We only support synchronous writing */ if (dwReserved && dwReserved != HSE_IO_SYNC) { - log_reason("ISAPI asynchronous I/O not supported", r->filename, r); + aplog_error(APLOG_MARK, APLOG_WARNING, r->server, + "ISAPI asynchronous I/O not supported: %s", r->filename); SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } @@ -401,7 +408,8 @@ int p; if (!lf) { /* Huh? Invalid data, I think */ - log_reason("ISA sent invalid headers", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ERR, r->server, + "ISA sent invalid headers: %s", r->filename); SetLastError(ERROR); /* XXX: Find right error */ return FALSE; } @@ -419,7 +427,8 @@ if (!(value = strchr(data, ':'))) { SetLastError(ERROR); /* XXX: Find right error */ - log_reason("ISA sent invalid headers", r->filename, r); + aplog_error(APLOG_MARK, APLOG_ERR, r->server, + "ISA sent invalid headers", r->filename); return FALSE; } @@ -492,7 +501,8 @@ /* We don't support all this async I/O, Microsoft-specific stuff */ case HSE_REQ_IO_COMPLETION: case HSE_REQ_TRANSMIT_FILE: - log_reason("ISAPI asynchronous I/O not supported", r->filename, r); + aplog_error(APLOG_MARK, APLOG_WARNING, r->server, + "ISAPI asynchronous I/O not supported: %s", r->filename); default: SetLastError(ERROR_INVALID_PARAMETER); return FALSE;