atom feed1 message in org.apache.tcl.rivet-devcvs commit: tcl-rivet/tests/apachetes...
FromSent OnAttachments
dav...@apache.orgOct 22, 2002 11:21 am 
Subject:cvs commit: tcl-rivet/tests/apachetest apachetest.tcl
From:dav...@apache.org (dav@apache.org)
Date:Oct 22, 2002 11:21:47 am
List:org.apache.tcl.rivet-dev

davidw 2002/10/22 11:21:47

Modified: . ChangeLog doc rivet.xml src TclWeb.h TclWebapache.c make.tcl mod_rivet.c mod_rivet.h rivetChannel.c rivetCore.c rivetCrypt.c rivetParser.c src/buildscripts aardvark.tcl findconfig.tcl tests/apachetest apachetest.tcl Log: * src/*.c: "CONST"ification. See http://mini.net/tcl/3669 for more information.

* src/: Minor build script updates.

Revision Changes Path 1.75 +7 -0 tcl-rivet/ChangeLog

Index: ChangeLog =================================================================== RCS file: /home/cvs/tcl-rivet/ChangeLog,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- ChangeLog 20 Oct 2002 17:02:55 -0000 1.74 +++ ChangeLog 22 Oct 2002 18:21:46 -0000 1.75 @@ -1,3 +1,10 @@ +2002-10-21 David N. Welton <dav@dedasys.com> + + * src/*.c: "CONST"ification. See http://mini.net/tcl/3669 for + more information. + + * src/: Minor build script updates. + 2002-10-20 David N. Welton <dav@dedasys.com>

* doc/rivet.xml: "make" needed to be "make.tcl". Thanks to Makoto

1.13 +1 -1 tcl-rivet/doc/rivet.xml

Index: rivet.xml =================================================================== RCS file: /home/cvs/tcl-rivet/doc/rivet.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rivet.xml 20 Oct 2002 17:02:55 -0000 1.12 +++ rivet.xml 22 Oct 2002 18:21:46 -0000 1.13 @@ -111,7 +111,7 @@ wish to compile them.

<programlisting>gunzip tcl-rivet-X.X.X.tar.gz - tar -xvf tcl-rivet-X.X.X.tar.gz</programlisting> +tar -xvf tcl-rivet-X.X.X.tar.gz</programlisting>

</para> </step>

1.17 +2 -2 tcl-rivet/src/TclWeb.h

Index: TclWeb.h =================================================================== RCS file: /home/cvs/tcl-rivet/src/TclWeb.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- TclWeb.h 12 Jul 2002 17:40:37 -0000 1.16 +++ TclWeb.h 22 Oct 2002 18:21:47 -0000 1.17 @@ -57,7 +57,7 @@

int TclWeb_PrintHeaders(TclWebRequest *req);

-int TclWeb_PrintError(char *errstr, int htmlflag, TclWebRequest *req); +int TclWeb_PrintError(CONST84 char *errstr, int htmlflag, TclWebRequest *req);

/* *-----------------------------------------------------------------------------

1.34 +2 -2 tcl-rivet/src/TclWebapache.c

Index: TclWebapache.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/TclWebapache.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- TclWebapache.c 18 Oct 2002 18:26:07 -0000 1.33 +++ TclWebapache.c 22 Oct 2002 18:21:47 -0000 1.34 @@ -81,7 +81,7 @@

/* Print nice HTML formatted errors */ int -TclWeb_PrintError(char *errstr, int htmlflag, TclWebRequest *req) +TclWeb_PrintError(CONST84 char *errstr, int htmlflag, TclWebRequest *req) { TclWeb_SetHeaderType(DEFAULT_HEADER_TYPE, req); TclWeb_PrintHeaders(req);

1.26 +7 -6 tcl-rivet/src/make.tcl

Index: make.tcl =================================================================== RCS file: /home/cvs/tcl-rivet/src/make.tcl,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- make.tcl 29 Sep 2002 23:09:05 -0000 1.25 +++ make.tcl 22 Oct 2002 18:21:47 -0000 1.26 @@ -2,10 +2,11 @@ # the next line restarts using tclsh \ exec tclsh "$0" "$@"

+# make.tcl +# # $Id$ - -# this file actually runs things, making use of the aardvark build -# system. +# +# This file is responsible for the top-level "make" style processing.

set scripts { helpers.tcl @@ -38,7 +39,7 @@ ## Try to find the Apache apxs script. set APXS [FindAPXS $APXS]

-if {![string length $APXS]} { +if { ![string length $APXS] } { puts stderr "Could not find Apache apxs script." append err "You need to edit 'make.tcl' to supply the location of " append err "Apache's apxs tool." @@ -78,7 +79,7 @@

# "depends" lists the nodes on which it depends

-# "sh" is the command to execute +# "sh" is a shell command to execute

AddNode apache_multipart_buffer.o { depends "apache_multipart_buffer.c apache_multipart_buffer.h"

1.51 +2 -2 tcl-rivet/src/mod_rivet.c

Index: mod_rivet.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/mod_rivet.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- mod_rivet.c 18 Oct 2002 07:01:32 -0000 1.50 +++ mod_rivet.c 22 Oct 2002 18:21:47 -0000 1.51 @@ -142,7 +142,7 @@ } Tcl_IncrRefCount(errscript); if (Tcl_EvalObj(interp, errscript) == TCL_ERROR) { - char *errorinfo = Tcl_GetVar( interp, "errorInfo", 0 ); + CONST84 char *errorinfo = Tcl_GetVar( interp, "errorInfo", 0 ); TclWeb_PrintError("<b>Rivet ErrorScript failed!</b>", 1, globals->req); TclWeb_PrintError( errorinfo, 0, globals->req );

1.22 +5 -0 tcl-rivet/src/mod_rivet.h

Index: mod_rivet.h =================================================================== RCS file: /home/cvs/tcl-rivet/src/mod_rivet.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mod_rivet.h 4 Aug 2002 02:44:37 -0000 1.21 +++ mod_rivet.h 22 Oct 2002 18:21:47 -0000 1.22 @@ -35,6 +35,11 @@

/* End Configuration options */

+/* For Tcl 8.3/8.4 compatibility - see http://mini.net/tcl/3669 */ +#ifndef CONST84 +# define CONST84 +#endif + #define STARTING_SEQUENCE "<?" #define ENDING_SEQUENCE "?>"

1.2 +2 -2 tcl-rivet/src/rivetChannel.c

Index: rivetChannel.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/rivetChannel.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rivetChannel.c 15 Mar 2002 07:47:43 -0000 1.1 +++ rivetChannel.c 22 Oct 2002 18:21:47 -0000 1.2 @@ -21,7 +21,7 @@ Channel that we create to divert stdout to. */

static int -outputproc(ClientData instancedata, char *buf, int toWrite, int *errorCodePtr) +outputproc(ClientData instancedata, CONST84 char *buf, int toWrite, int
*errorCodePtr) { rivet_server_conf *rsc = (rivet_server_conf *)instancedata; rivet_interp_globals *globals = @@ -44,7 +44,7 @@

static int setoptionproc(ClientData instancedata, Tcl_Interp *interp, - char *optionname, char *value) + CONST84 char *optionname, CONST84 char *value) { return TCL_OK; }

1.28 +3 -3 tcl-rivet/src/rivetCore.c

Index: rivetCore.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/rivetCore.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- rivetCore.c 18 Oct 2002 18:26:07 -0000 1.27 +++ rivetCore.c 22 Oct 2002 18:21:47 -0000 1.28 @@ -446,7 +446,7 @@

Tcl_Obj *result = NULL;

- static char *SubCommand[] = { + static CONST84 char *SubCommand[] = { "channel", "save", "data", @@ -516,7 +516,7 @@ if (TclWeb_UploadChannel(varname, &chan, globals->req) != TCL_OK) { return TCL_ERROR; } - channelname = Tcl_GetChannelName(chan); + (CONST84 char *)channelname = Tcl_GetChannelName(chan); Tcl_SetStringObj(result, channelname, -1); break; }

1.4 +1 -0 tcl-rivet/src/rivetCrypt.c

Index: rivetCrypt.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/rivetCrypt.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rivetCrypt.c 11 Mar 2002 00:31:10 -0000 1.3 +++ rivetCrypt.c 22 Oct 2002 18:21:47 -0000 1.4 @@ -4,6 +4,7 @@

#include <tcl.h> #include "rivet.h" +#include <crypt.h> #include <unistd.h>

#define MODE_DECRYPT 0

1.7 +3 -3 tcl-rivet/src/rivetParser.c

Index: rivetParser.c =================================================================== RCS file: /home/cvs/tcl-rivet/src/rivetParser.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rivetParser.c 18 Oct 2002 07:01:32 -0000 1.6 +++ rivetParser.c 22 Oct 2002 18:21:47 -0000 1.7 @@ -158,7 +158,7 @@ while (*next != 0) { cur = next; - next = Tcl_UtfNext(cur); + (CONST84 char*)next = Tcl_UtfNext(cur); if (!inside) { /* Outside the delimiting tags. */ @@ -170,7 +170,7 @@ Tcl_AppendToObj(outbuf, "\"\n", 2); inside = 1; p = 0; - cur = Tcl_UtfNext(cur); + (CONST84 char*)cur = Tcl_UtfNext(cur); continue; } } else {

1.9 +1 -2 tcl-rivet/src/buildscripts/aardvark.tcl

Index: aardvark.tcl =================================================================== RCS file: /home/cvs/tcl-rivet/src/buildscripts/aardvark.tcl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- aardvark.tcl 19 Jul 2002 22:36:19 -0000 1.8 +++ aardvark.tcl 22 Oct 2002 18:21:47 -0000 1.9 @@ -8,7 +8,6 @@ package provide aardvark 0.1 package require struct

- namespace eval aardvark { # the graph 'object' we use throughout. variable grph

1.3 +2 -2 tcl-rivet/src/buildscripts/findconfig.tcl

Index: findconfig.tcl =================================================================== RCS file: /home/cvs/tcl-rivet/src/buildscripts/findconfig.tcl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- findconfig.tcl 8 Nov 2001 01:37:12 -0000 1.2 +++ findconfig.tcl 22 Oct 2002 18:21:47 -0000 1.3 @@ -32,7 +32,7 @@ return [file join $libdir tclConfig.sh] } } - } + } # Not in usual places, go searching for tclsh... set candshells [list] if {[regsub -nocase wish $exec tclsh shell]} {

1.6 +7 -1 tcl-rivet/tests/apachetest/apachetest.tcl

Index: apachetest.tcl =================================================================== RCS file: /home/cvs/tcl-rivet/tests/apachetest/apachetest.tcl,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apachetest.tcl 27 Sep 2002 17:28:17 -0000 1.5 +++ apachetest.tcl 22 Oct 2002 18:21:47 -0000 1.6 @@ -12,6 +12,8 @@

namespace eval apachetest {

+ set debug 1 + # Associate module names with their internal names. array set module_assoc { mod_log_config config_log_module @@ -67,7 +69,11 @@

proc apachetest::startserver { args } { variable binname + variable debug if { [catch { + if { $debug } { + puts "$binname -X -f [file join [pwd] server.conf] [concat $args]" + } eval exec $binname -X -f \ "[file join [pwd] server.conf]" [concat $args] } err] } {