jfclere 01/06/07 02:40:37 Modified: webapp/include wa.h webapp/lib pr_warp.c wa_main.c wa_request.c Log: Arrange C++ comments that offened my compilers. Revision Changes Path 1.9 +2 -2 jakarta-tomcat-connectors/webapp/include/wa.h Index: wa.h =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/include/wa.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wa.h 2001/05/12 02:31:48 1.8 +++ wa.h 2001/06/07 09:40:27 1.9 @@ -57,7 +57,7 @@ /** * @author Pier Fumagalli <mailto:[EMAIL PROTECTED]> - * @version $Id: wa.h,v 1.8 2001/05/12 02:31:48 jon Exp $ + * @version $Id: wa.h,v 1.9 2001/06/07 09:40:27 jfclere Exp $ */ #ifndef _WA_H_ #define _WA_H_ @@ -100,7 +100,7 @@ /* All declared providers */ extern wa_provider wa_provider_info; extern wa_provider wa_provider_warp; -//extern wa_provider wa_provider_jni; +/*extern wa_provider wa_provider_jni;*/ /* WebApp Library includes */ #include <wa_main.h> 1.3 +5 -5 jakarta-tomcat-connectors/webapp/lib/pr_warp.c Index: pr_warp.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/pr_warp.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pr_warp.c 2001/05/12 02:31:48 1.2 +++ pr_warp.c 2001/06/07 09:40:32 1.3 @@ -55,7 +55,7 @@ * * * ========================================================================= */ -/* @version $Id: pr_warp.c,v 1.2 2001/05/12 02:31:48 jon Exp $ */ +/* @version $Id: pr_warp.c,v 1.3 2001/06/07 09:40:32 jfclere Exp $ */ #include <wa.h> /* ************************************************************************* */ @@ -154,11 +154,11 @@ if (s==NULL) return(p_wshort(p,0)); - // Evaluate string length + /* Evaluate string length */ l=strlen(s); - // Store string length + /* Store string length */ if (!p_wshort(p,strlen(s))) return(FALSE); - // Check if we have room in the buffer and copy the string + /* Check if we have room in the buffer and copy the string */ if ((p->bpos+l)>MAXPAYLOAD) return(FALSE); for(x=0; x<l; x++) p->buff[p->bpos++]=s[x]; return(TRUE); @@ -168,7 +168,7 @@ int k=0; int x=0; - // Store the two bytes + /* Store the two bytes */ x=p->bpos; k=((p->buff[p->bpos++]<<8)&0x0ff00); k=((k|(p->buff[p->bpos++]&0x0ff))&0x0ffff); 1.6 +2 -2 jakarta-tomcat-connectors/webapp/lib/wa_main.c Index: wa_main.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/wa_main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wa_main.c 2001/05/10 21:12:32 1.5 +++ wa_main.c 2001/06/07 09:40:33 1.6 @@ -55,7 +55,7 @@ * * * ========================================================================= */ -/* @version $Id: wa_main.c,v 1.5 2001/05/10 21:12:32 pier Exp $ */ +/* @version $Id: wa_main.c,v 1.6 2001/06/07 09:40:33 jfclere Exp $ */ #include <wa.h> /* The current APR memory pool. */ @@ -66,7 +66,7 @@ wa_provider *wa_providers[] = { &wa_provider_info, &wa_provider_warp, - //&wa_provider_jni, + /*&wa_provider_jni,*/ NULL, }; 1.10 +2 -2 jakarta-tomcat-connectors/webapp/lib/wa_request.c Index: wa_request.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/webapp/lib/wa_request.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wa_request.c 2001/05/10 21:12:33 1.9 +++ wa_request.c 2001/06/07 09:40:33 1.10 @@ -55,7 +55,7 @@ * * * ========================================================================= */ -/* @version $Id: wa_request.c,v 1.9 2001/05/10 21:12:33 pier Exp $ */ +/* @version $Id: wa_request.c,v 1.10 2001/06/07 09:40:33 jfclere Exp $ */ #include <wa.h> /* Allocate a new request structure. */ @@ -191,7 +191,7 @@ /* Invoke a request in a web application. */ int wa_rinvoke(wa_request *r, wa_application *a) { return(a->conn->prov->handle(r,a)); - //return(wa_rerror(r,500,"This is being fixed")); + /*return(wa_rerror(r,500,"This is being fixed"));*/ } void wa_rlog(wa_request *r, const char *f, const int l, const char *fmt, ...) {