You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by ro...@apache.org on 2013/02/07 18:42:52 UTC
svn commit: r1443622 - in /tcl/websh/trunk/src: ChangeLog
generic/interpool.c generic/logtosyslog.c generic/url.c
Author: ronnie
Date: Thu Feb 7 17:42:52 2013
New Revision: 1443622
URL: http://svn.apache.org/viewvc?rev=1443622&view=rev
Log:
- fix compilation with -W on FreeBSD (thanks to Pietro Cerutti)
Modified:
tcl/websh/trunk/src/ChangeLog
tcl/websh/trunk/src/generic/interpool.c
tcl/websh/trunk/src/generic/logtosyslog.c
tcl/websh/trunk/src/generic/url.c
Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?rev=1443622&r1=1443621&r2=1443622&view=diff
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Thu Feb 7 17:42:52 2013
@@ -1,3 +1,7 @@
+2013-02-07 Ronnie Brunner <ro...@netcetera.com>
+ * src/generic/interpool.c, src/generic/logtosyslog.c, src/generic/url.c:
+ - Fix compilation with -W on FreeBSD (thanks to Pietro Cerutti)
+
2012-10-25 Brunner Ronnie <ro...@netcetera.com>
* src/apachetests/apachetest.tcl, src/apachetests/conf/server.conf.tcl:
- make tests run with Apache httpd 2.4 (tested against 2.4.3)
Modified: tcl/websh/trunk/src/generic/interpool.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/interpool.c?rev=1443622&r1=1443621&r2=1443622&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/interpool.c (original)
+++ tcl/websh/trunk/src/generic/interpool.c Thu Feb 7 17:42:52 2013
@@ -569,11 +569,11 @@ int initPool(websh_server_conf * conf)
TCL_ERROR) {
errno = 0;
#ifndef APACHE2
- ap_log_printf(conf->server,
+ ap_log_printf(conf->server, "%s",
Tcl_GetStringResult(conf->mainInterp));
#else /* APACHE2 */
ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_ERR, 0,
- conf->server, Tcl_GetStringResult(conf->mainInterp));
+ conf->server, "%s", Tcl_GetStringResult(conf->mainInterp));
#endif /* APACHE2 */
return 0;
}
Modified: tcl/websh/trunk/src/generic/logtosyslog.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/logtosyslog.c?rev=1443622&r1=1443621&r2=1443622&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/logtosyslog.c (original)
+++ tcl/websh/trunk/src/generic/logtosyslog.c Thu Feb 7 17:42:52 2013
@@ -113,7 +113,7 @@ int logToSyslog(Tcl_Interp * interp, Cli
/* ----------------------------------------------------------------------
* gonna call syslogName msg
* ------------------------------------------------------------------- */
- syslog((int) (*logToSyslogData), msg);
+ syslog((int) (*logToSyslogData), "%s", msg);
return TCL_OK;
}
Modified: tcl/websh/trunk/src/generic/url.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/url.c?rev=1443622&r1=1443621&r2=1443622&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/url.c (original)
+++ tcl/websh/trunk/src/generic/url.c Thu Feb 7 17:42:52 2013
@@ -61,7 +61,10 @@ enum urlElement
PORT,
SCRIPTNAME,
PATHINFO,
- QUERYSTRING
+ QUERYSTRING,
+ URLCFGRESET,
+ URLCFGURLFORMAT,
+ URLCFGEND
};
@@ -362,7 +365,7 @@ Tcl_Obj *createQueryList(Tcl_Interp * in
Tcl_Obj *tmp = NULL;
int errCnt = 0;
- if ((urlData == NULL))
+ if (urlData == NULL)
return NULL;
errCnt = 0;
@@ -839,11 +842,6 @@ int Web_CmdUrlCfg(ClientData clientData,
Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[])
{
-
-#define URLCFGRESET (enum urlElement)QUERYSTRING+1
-#define URLCFGURLFORMAT (enum urlElement)QUERYSTRING+2
-#define URLCFGEND (enum urlElement)QUERYSTRING+3
-
UrlData *urlData = NULL;
/* note: this could be dynamic, but 20 is enough ... */
char *params[20];
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org