Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@jakarta.apache.org Received: (qmail 78936 invoked by uid 500); 10 May 2001 21:15:11 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: tomcat-dev@jakarta.apache.org Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 78883 invoked by uid 500); 10 May 2001 21:15:06 -0000 Delivered-To: apmail-jakarta-tomcat-4.0-cvs@apache.org Date: 10 May 2001 21:15:04 -0000 Message-ID: <20010510211504.78858.qmail@apache.org> From: pier@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/connectors/include wa.h wa_main.h wa_request.h pier 01/05/10 14:15:04 Modified: connectors/include wa.h wa_main.h wa_request.h Log: Modified logging. Added the WARP provider. Revision Changes Path 1.7 +2 -2 jakarta-tomcat-4.0/connectors/include/wa.h Index: wa.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/include/wa.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wa.h 2001/05/10 15:50:04 1.6 +++ wa.h 2001/05/10 21:14:59 1.7 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli - * @version $Id: wa.h,v 1.6 2001/05/10 15:50:04 pier Exp $ + * @version $Id: wa.h,v 1.7 2001/05/10 21:14:59 pier Exp $ */ #ifndef _WA_H_ #define _WA_H_ @@ -94,7 +94,7 @@ /* All declared providers */ extern wa_provider wa_provider_info; -//extern wa_provider wa_provider_warp; +extern wa_provider wa_provider_warp; //extern wa_provider wa_provider_jni; /* WebApp Library includes */ 1.4 +11 -1 jakarta-tomcat-4.0/connectors/include/wa_main.h Index: wa_main.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/include/wa_main.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- wa_main.h 2001/05/10 09:02:45 1.3 +++ wa_main.h 2001/05/10 21:15:00 1.4 @@ -58,7 +58,7 @@ /** * @package Main * @author Pier Fumagalli - * @version $Id: wa_main.h,v 1.3 2001/05/10 09:02:45 pier Exp $ + * @version $Id: wa_main.h,v 1.4 2001/05/10 21:15:00 pier Exp $ */ #ifndef _WA_MAIN_H_ #define _WA_MAIN_H_ @@ -212,6 +212,16 @@ * @param others The parameters to the format string. */ void wa_debug(const char *f, const int l, const char *fmt, ...); + +/** + * Log an error message. + * + * @param f The file where this function was called. + * @param l The line number where this function was called. + * @param fmt The format string of the debug message (printf style). + * @param others The parameters to the format string. + */ +void wa_log(const char *f, const int l, const char *fmt, ...); /** * The WebApp library memory pool. 1.5 +3 -2 jakarta-tomcat-4.0/connectors/include/wa_request.h Index: wa_request.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-4.0/connectors/include/wa_request.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- wa_request.h 2001/05/10 06:28:43 1.4 +++ wa_request.h 2001/05/10 21:15:01 1.5 @@ -58,7 +58,7 @@ /** * @package Request Handling * @author Pier Fumagalli - * @version $Id: wa_request.h,v 1.4 2001/05/10 06:28:43 pier Exp $ + * @version $Id: wa_request.h,v 1.5 2001/05/10 21:15:01 pier Exp $ */ #ifndef _WA_REQUEST_H_ #define _WA_REQUEST_H_ @@ -156,7 +156,8 @@ * @param ... The parameters to the format string. * @return The HTTP result code of this operation. */ -int wa_rerror(wa_request *r, int s, const char *fmt, ...); +int wa_rerror(const char *file, const int line, wa_request *r, int s, + const char *fmt, ...); /** * Invoke a request in a web application.