You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2011/09/23 18:52:52 UTC
svn commit: r1174881 - in /tcl/rivet/branches/2.0: ChangeLog
src/apache-1/rivetCore.c
Author: mxmanghi
Date: Fri Sep 23 16:52:52 2011
New Revision: 1174881
URL: http://svn.apache.org/viewvc?rev=1174881&view=rev
Log:
* src/apache-1/rivetCore.c: fixed declarations for various calls to ap_pstrcat.
Modified:
tcl/rivet/branches/2.0/ChangeLog
tcl/rivet/branches/2.0/src/apache-1/rivetCore.c
Modified: tcl/rivet/branches/2.0/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.0/ChangeLog?rev=1174881&r1=1174880&r2=1174881&view=diff
==============================================================================
--- tcl/rivet/branches/2.0/ChangeLog (original)
+++ tcl/rivet/branches/2.0/ChangeLog Fri Sep 23 16:52:52 2011
@@ -1,4 +1,7 @@
2011-09-23 Massimo Manghi <mx...@apache.org>
+ * src/apache-1/rivetCore.c: fixed declarations for various calls to ap_pstrcat.
+
+2011-09-23 Massimo Manghi <mx...@apache.org>
* debian/rules,debian/changelog: new lintian required targets, current Debian package version bumped up to 2.0.4-1
* src/apache-1/TclWebapache.c,src/apache-1/rivetCode.c: latest changes for 'makeurl', 'load_env' and 'load_headers'
ported to code for Apache 1.x
Modified: tcl/rivet/branches/2.0/src/apache-1/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2.0/src/apache-1/rivetCore.c?rev=1174881&r1=1174880&r2=1174881&view=diff
==============================================================================
--- tcl/rivet/branches/2.0/src/apache-1/rivetCore.c (original)
+++ tcl/rivet/branches/2.0/src/apache-1/rivetCore.c Fri Sep 23 16:52:52 2011
@@ -112,16 +112,16 @@ TCL_CMD_HEADER( Rivet_MakeURL )
if (script_name[script_name_l-1] == '/')
{
- url_target_name = apr_pstrcat(globals->req->req->pool,script_name,url_target_name,NULL);
+ url_target_name = ap_pstrcat(POOL,script_name,url_target_name,NULL);
}
else
{
- url_target_name = apr_pstrcat(globals->req->req->pool,script_name,"/",url_target_name,NULL);
+ url_target_name = ap_pstrcat(POOL,script_name,"/",url_target_name,NULL);
}
}
else
{
- url_target_name = apr_pstrcat(globals->req->req->pool,"/",url_target_name,NULL);
+ url_target_name = ap_pstrcat(POOL,"/",url_target_name,NULL);
}
}
}
@@ -866,7 +866,6 @@ TCL_CMD_HEADER( Rivet_ApacheTable )
TCL_CMD_HEADER( Rivet_Upload )
{
char *varname = NULL;
- char *command = NULL;
int subcommandindex;
@@ -898,7 +897,6 @@ TCL_CMD_HEADER( Rivet_Upload )
};
rivet_interp_globals *globals = Tcl_GetAssocData(interp, "rivet", NULL);
- command = Tcl_GetString(objv[1]);
Tcl_GetIndexFromObj(interp, objv[1], SubCommand,
"channel|save|data|exists|size|type|filename|tempname|names",
0, &subcommandindex);
@@ -1249,7 +1247,6 @@ TCL_CMD_HEADER( Rivet_VirtualFilenameCmd
TCL_CMD_HEADER( Rivet_LogErrorCmd )
{
- char *loglevel = NULL;
char *message = NULL;
server_rec *serverRec;
@@ -1287,7 +1284,7 @@ TCL_CMD_HEADER( Rivet_LogErrorCmd )
return TCL_ERROR;
}
- loglevel = Tcl_GetString(objv[1]);
+// loglevel = Tcl_GetString(objv[1]);
message = Tcl_GetString (objv[2]);
if (Tcl_GetIndexFromObj(interp, objv[1], logLevel,
"emerg|alert|crit|err|warning|notice|info|debug",
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org