You are viewing a plain text version of this content. The canonical link for it is here.
Posted to websh-cvs@tcl.apache.org by ro...@apache.org on 2002/09/11 15:54:02 UTC
cvs commit: tcl-websh/src/generic apchannel.c args.c args.h cfg.c conv.c dispatch.c filecounter.c htmlify.c log.c macros.h messages.c mod_websh.c modwebsh_ap.c modwebsh_cgi.c paramlist.c request.c response_ap.c uricode.c url.c varchannel.c weboutint.c
ronnie 2002/09/11 06:54:01
Modified: src/generic apchannel.c args.c args.h cfg.c conv.c
dispatch.c filecounter.c htmlify.c log.c macros.h
messages.c mod_websh.c modwebsh_ap.c modwebsh_cgi.c
paramlist.c request.c response_ap.c uricode.c url.c
varchannel.c weboutint.c
Log:
- various type casts to match tcl 8.4 changes
Revision Changes Path
1.4 +2 -2 tcl-websh/src/generic/apchannel.c
Index: apchannel.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/apchannel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apchannel.c 25 Oct 2001 17:50:13 -0000 1.3
+++ apchannel.c 11 Sep 2002 13:54:01 -0000 1.4
@@ -71,7 +71,7 @@
* output to apache channel
* ------------------------------------------------------------------------- */
int apchannelOutputProc(ClientData clientData,
- char *buf, int toWrite, int *errorCodePtr)
+ TCLCONST char *buf, int toWrite, int *errorCodePtr)
{
int res = -1;
1.4 +6 -6 tcl-websh/src/generic/args.c
Index: args.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/args.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- args.c 25 Oct 2001 17:50:13 -0000 1.3
+++ args.c 11 Sep 2002 13:54:01 -0000 1.4
@@ -119,13 +119,13 @@
* argPosParam -- scan params to find key
* returns index to **params, if key is found, or -1
* ------------------------------------------------------------------------- */
-int argPosParam(char **params, char *key)
+int argPosParam(TCLCONST char *params[], char *key)
{
char **intParams;
int pos = 0;
- intParams = params;
+ intParams = (char **) params;
if ((key == NULL) || (params == NULL))
return -1;
@@ -189,7 +189,7 @@
* note: assumes that first arg is command name
* ------------------------------------------------------------------------- */
int argIndexOfFirstArg(int objc, Tcl_Obj * CONST objv[],
- char **params, int *Nparams)
+ TCLCONST char *params[], int *Nparams)
{
int pos = -1;
@@ -303,8 +303,8 @@
* (from 1 to min(objc,scanc)). If scanc == -1, scan up to objc.
* returns 0 if ok, index of argument which is unknown, if found
* ------------------------------------------------------------------------- */
-int argHasOnlyAccepted(int objc, Tcl_Obj * CONST objv[], char *params[],
- int scanc)
+int argHasOnlyAccepted(int objc, Tcl_Obj * CONST objv[],
+ TCLCONST char *params[], int scanc)
{
int i;
1.4 +8 -6 tcl-websh/src/generic/args.h
Index: args.h
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/args.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- args.h 25 Oct 2001 17:50:13 -0000 1.3
+++ args.h 11 Sep 2002 13:54:01 -0000 1.4
@@ -18,6 +18,8 @@
#ifndef WEBARGS_H
#define WEBARGS_H
+#include "macros.h"
+
#define OPTION_TYPE_NONE 0
#define OPTION_TYPE_PARAM 1
#define OPTION_TYPE_DASHDASH 2
@@ -28,12 +30,12 @@
int argIndexOfNextKey(int objc, Tcl_Obj * CONST objv[], int previous);
int argKeyExists(int objc, Tcl_Obj * CONST objv[], char *key);
Tcl_Obj *argValueOfKey(int objc, Tcl_Obj * CONST objv[], char *key);
-int argPosParam(char **params, char *key);
+int argPosParam(TCLCONST char *params[], char *key);
int argIndexOfFirstOpt(int objc, Tcl_Obj * CONST objv[]);
-int argIndexOfFirstArg(int objc, Tcl_Obj * CONST objv[],
- char **params, int *Nparams);
-int argHasOnlyAccepted(int objc, Tcl_Obj * CONST objv[], char *params[],
- int scanc);
+int argIndexOfFirstArg(int objc, Tcl_Obj * CONST objv[],
+ TCLCONST char *params[], int *Nparams);
+int argHasOnlyAccepted(int objc, Tcl_Obj * CONST objv[],
+ TCLCONST char *params[], int scanc);
int argOptionType(Tcl_Obj * in);
#endif
1.15 +3 -3 tcl-websh/src/generic/cfg.c
Index: cfg.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/cfg.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cfg.c 31 Jul 2002 22:21:52 -0000 1.14
+++ cfg.c 11 Sep 2002 13:54:01 -0000 1.15
@@ -117,13 +117,13 @@
{
/* keep consistent with enum PutxMarkup in request.h */
- static char *putxMarkups[] = {
+ static TCLCONST char *putxMarkups[] = {
"brace",
"tag",
NULL
};
- static char *subCmd1[] = {
+ static TCLCONST char *subCmd1[] = {
"uploadfilesize",
"encryptchain",
"decryptchain",
1.4 +2 -2 tcl-websh/src/generic/conv.c
Index: conv.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/conv.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- conv.c 25 Oct 2001 17:50:13 -0000 1.3
+++ conv.c 11 Sep 2002 13:54:01 -0000 1.4
@@ -76,7 +76,7 @@
Tcl_Obj *res = NULL;
int useNumeric = TCL_ERROR;
int iCurArg = 0;
- static char *params[] = { "-numeric", NULL };
+ static TCLCONST char *params[] = { "-numeric", NULL };
enum params
{ NUMERIC };
1.6 +8 -8 tcl-websh/src/generic/dispatch.c
Index: dispatch.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/dispatch.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dispatch.c 16 Jul 2002 11:35:29 -0000 1.5
+++ dispatch.c 11 Sep 2002 13:54:01 -0000 1.6
@@ -38,7 +38,7 @@
{
RequestData *requestData = NULL;
- char *params[] = { "-track",
+ TCLCONST char *params[] = { "-track",
"-querystring",
"-postdata",
"-cmd",
@@ -79,7 +79,7 @@
/* ==========================================================================
* query_string
* ======================================================================= */
- query_string = argValueOfKey(objc, objv, params[QUERYSTRING]);
+ query_string = argValueOfKey(objc, objv, (char *)params[QUERYSTRING]);
if (query_string == NULL) {
/* ------------------------------------------------------------------------
@@ -109,7 +109,7 @@
/* ==========================================================================
* post_data
* ======================================================================= */
- post_data = argValueOfKey(objc, objv, params[POSTDATA]);
+ post_data = argValueOfKey(objc, objv, (char *)params[POSTDATA]);
if (post_data != NULL) {
@@ -124,7 +124,7 @@
int idx1 = 0;
int idx2 = 0;
- if ((idx1 = argIndexOfKey(objc, objv, params[POSTDATA])) > 0) {
+ if ((idx1 = argIndexOfKey(objc, objv, (char *)params[POSTDATA])) > 0) {
idx2 = argIndexOfNextKey(objc, objv, idx1);
@@ -212,7 +212,7 @@
Tcl_Obj *key = NULL;
Tcl_Obj *val = NULL;
- trackList = argValueOfKey(objc, objv, params[TRACK]);
+ trackList = argValueOfKey(objc, objv, (char *)params[TRACK]);
if ((trackList != NULL) &&
(listLen = tclGetListLength(interp, trackList)) != -1) {
@@ -275,7 +275,7 @@
* --------------------------------------------------------------------- */
Tcl_ResetResult(interp);
- cmdName = argValueOfKey(objc, objv, params[CMD]);
+ cmdName = argValueOfKey(objc, objv, (char *)params[CMD]);
if (cmdName != NULL) {
@@ -356,7 +356,7 @@
Tcl_Obj *hook = NULL;
/* first eval hook, if any */
- hook = argValueOfKey(objc, objv, params[HOOK]);
+ hook = argValueOfKey(objc, objv, (char *)params[HOOK]);
if (hook != NULL) {
1.6 +12 -12 tcl-websh/src/generic/filecounter.c
Index: filecounter.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/filecounter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- filecounter.c 17 Apr 2002 11:27:37 -0000 1.5
+++ filecounter.c 11 Sep 2002 13:54:01 -0000 1.6
@@ -50,10 +50,10 @@
{
SeqNoGenerator *seqnogen = (SeqNoGenerator *) clientData;
- static char *subCommands[] = { "curval", "nextval", "config", NULL };
+ static TCLCONST char *subCommands[] = { "curval", "nextval", "config", NULL };
enum subCommands
{ CURVAL, NEXTVAL, CONFIG };
- char **ptr = subCommands;
+ char **ptr = (char **) subCommands;
int idx;
int seqno;
@@ -162,7 +162,7 @@
SeqNoGenerator *seqnogen = NULL;
Tcl_Obj *result = NULL;
Tcl_CmdInfo cmdInfo;
- static char *params[] = { "-filename", "-seed", "-min", "-max",
+ static TCLCONST char *params[] = { "-filename", "-seed", "-min", "-max",
"-incr", "-perms", "-wrap", NULL
};
enum params
@@ -179,7 +179,7 @@
* ------------------------------------------------------------------- */
if (objc < 4 ||
argIndexOfFirstArg(objc, objv, NULL, NULL) != 1 ||
- (fnameobj = argValueOfKey(objc, objv, params[FILENAME])) == NULL) {
+ (fnameobj = argValueOfKey(objc, objv, (char *) params[FILENAME])) == NULL) {
Tcl_WrongNumArgs(interp, 1, objv,
"handle -filename filename ?options?");
return TCL_ERROR;
@@ -190,12 +190,12 @@
* ------------------------------------------------------------------- */
hnameobj = objv[1];
/* fnameobj already done */
- seedobj = argValueOfKey(objc, objv, params[SEED]);
- maxobj = argValueOfKey(objc, objv, params[MAX]);
- minobj = argValueOfKey(objc, objv, params[MIN]);
- incrobj = argValueOfKey(objc, objv, params[INCR]);
- maskobj = argValueOfKey(objc, objv, params[MASK]);
- wrapobj = argValueOfKey(objc, objv, params[WRAP]);
+ seedobj = argValueOfKey(objc, objv, (char *)params[SEED]);
+ maxobj = argValueOfKey(objc, objv, (char *)params[MAX]);
+ minobj = argValueOfKey(objc, objv, (char *)params[MIN]);
+ incrobj = argValueOfKey(objc, objv, (char *)params[INCR]);
+ maskobj = argValueOfKey(objc, objv, (char *)params[MASK]);
+ wrapobj = argValueOfKey(objc, objv, (char *)params[WRAP]);
/* ----------------------------------------------------------------------
* check if handle already exists
@@ -332,7 +332,7 @@
LOG_MSG(interp, WRITE_LOG,
__FILE__, __LINE__,
"web::filecounter", WEBLOG_ERROR,
- Tcl_GetStringResult(interp), NULL);
+ (char *) Tcl_GetStringResult(interp), NULL);
return TCL_ERROR;
}
1.4 +11 -11 tcl-websh/src/generic/htmlify.c
Index: htmlify.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/htmlify.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- htmlify.c 25 Oct 2001 17:50:13 -0000 1.3
+++ htmlify.c 11 Sep 2002 13:54:01 -0000 1.4
@@ -346,12 +346,12 @@
/* ----------------------------------------------------------------------------
* findCmtClose
* ------------------------------------------------------------------------- */
-char *findHtmlCmtClose(char *utf)
+TCLCONST char *findHtmlCmtClose(TCLCONST char *utf)
{
- char *cmtclose = NULL;
- char *next1 = NULL;
- char *next2 = NULL;
+ TCLCONST char *cmtclose = NULL;
+ TCLCONST char *next1 = NULL;
+ TCLCONST char *next2 = NULL;
if (utf == NULL)
return NULL;
@@ -382,12 +382,12 @@
{
int len = 0;
- char *utf = NULL;
- char *cmtopen = NULL;
- char *cmtclose = NULL;
- char *next1 = NULL;
- char *next2 = NULL;
- char *next3 = NULL;
+ TCLCONST char *utf = NULL;
+ TCLCONST char *cmtopen = NULL;
+ TCLCONST char *cmtclose = NULL;
+ TCLCONST char *next1 = NULL;
+ TCLCONST char *next2 = NULL;
+ TCLCONST char *next3 = NULL;
if ((in == NULL) || (res == NULL))
return TCL_ERROR;
1.10 +7 -7 tcl-websh/src/generic/log.c
Index: log.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/log.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- log.c 20 Mar 2002 17:41:47 -0000 1.9
+++ log.c 11 Sep 2002 13:54:01 -0000 1.10
@@ -370,13 +370,13 @@
int idx;
int iCurArg;
- static char *params[] = { "-maxchar",
+ static TCLCONST char *params[] = { "-maxchar",
"-format",
NULL
};
enum params
{ MAXCHAR, FORMAT };
- static char *subCommands[] = { WEB_LOG_SUBCMD_ADD,
+ static TCLCONST char *subCommands[] = { WEB_LOG_SUBCMD_ADD,
WEB_LOG_SUBCMD_DELETE,
WEB_LOG_SUBCMD_NAMES, NULL
};
@@ -444,7 +444,7 @@
}
/* check for -format */
- if ((tcloTmp = argValueOfKey(objc, objv, params[FORMAT])) != NULL) {
+ if ((tcloTmp = argValueOfKey(objc, objv, (char *)params[FORMAT])) != NULL) {
format = allocAndSet(Tcl_GetString(tcloTmp));
}
else {
@@ -453,7 +453,7 @@
/* check for -maxchar */
if ((tcloTmp =
- argValueOfKey(objc, objv, params[MAXCHAR])) != NULL) {
+ argValueOfKey(objc, objv, (char *)params[MAXCHAR])) != NULL) {
if (Tcl_GetLongFromObj(interp, tcloTmp, &maxCharInMsg) ==
TCL_ERROR) {
LOG_MSG(interp, WRITE_LOG | SET_RESULT, __FILE__,
@@ -642,7 +642,7 @@
LogData *logData;
int idx;
- static char *subCommands[] = {
+ static TCLCONST char *subCommands[] = {
WEB_LOG_SUBCMD_ADD,
WEB_LOG_SUBCMD_DELETE,
WEB_LOG_SUBCMD_NAMES,
@@ -922,7 +922,7 @@
#endif
if ((flag & INTERP_ERRORINFO) && (interp != NULL)) {
- char *errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
+ char *errorInfo = (char *) Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY);
if (errorInfo != NULL)
webLog(interp, WEBLOG_DEBUG, errorInfo);
else
1.5 +13 -1 tcl-websh/src/generic/macros.h
Index: macros.h
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/macros.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- macros.h 9 Apr 2002 15:38:31 -0000 1.4
+++ macros.h 11 Sep 2002 13:54:01 -0000 1.5
@@ -16,6 +16,18 @@
#ifndef WEB_MACROS_H
#define WEB_MACROS_H
+#include <tcl.h>
+
+#if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 4)
+# ifndef NO_CONST
+# define TCLCONST const
+# else
+# define TCLCONST
+# endif
+#else
+# define TCLCONST
+#endif
+
#include "log.h"
#define WEBSH "websh"
1.6 +3 -3 tcl-websh/src/generic/messages.c
Index: messages.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/messages.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- messages.c 5 Apr 2002 11:54:50 -0000 1.5
+++ messages.c 11 Sep 2002 13:54:01 -0000 1.6
@@ -118,7 +118,7 @@
int mode = 0;
Tcl_DString ds;
char *data = NULL;
- char *res = NULL;
+ TCLCONST char *res = NULL;
int cmdcode = 0;
int flags = 0;
int size = 0;
@@ -226,7 +226,7 @@
int parseFlags(Tcl_Interp * interp, char *flaglist, int *flags)
{
- char **argv;
+ TCLCONST char **argv;
int argc;
int count;
Tcl_DString ds;
1.14 +2 -2 tcl-websh/src/generic/mod_websh.c
Index: mod_websh.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/mod_websh.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_websh.c 18 Apr 2002 14:40:11 -0000 1.13
+++ mod_websh.c 11 Sep 2002 13:54:01 -0000 1.14
@@ -316,7 +316,7 @@
char *errorInfo = NULL;
errorInfo =
- Tcl_GetVar(webInterp->interp, "errorInfo", TCL_GLOBAL_ONLY);
+ (char *) Tcl_GetVar(webInterp->interp, "errorInfo", TCL_GLOBAL_ONLY);
logToAp(webInterp->interp, NULL, errorInfo);
}
1.9 +5 -4 tcl-websh/src/generic/modwebsh_ap.c
Index: modwebsh_ap.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/modwebsh_ap.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- modwebsh_ap.c 18 Apr 2002 14:40:11 -0000 1.8
+++ modwebsh_ap.c 11 Sep 2002 13:54:01 -0000 1.9
@@ -184,7 +184,7 @@
int index;
- static char *interpParams[] = {
+ static TCLCONST char *interpParams[] = {
"numrequests",
"starttime",
"lastusedtime",
@@ -272,7 +272,8 @@
WebInterpClass *webInterpClass = NULL;
int index;
- static char *classParams[] = { "maxttl", "maxidletime", "maxrequests" };
+ static TCLCONST char *classParams[] = { "maxttl",
+ "maxidletime", "maxrequests" };
enum params
{ CLASS_TTL, CLASS_IDLETIME, CLASS_REQUESTS };
@@ -437,7 +438,7 @@
/* these options should be in sync with the options in Web_Cfg
* not the order or anything, but the actual text strings */
- static char *subCmd[] = {
+ static TCLCONST char *subCmd[] = {
"script",
"server_root",
"document_root",
1.7 +2 -2 tcl-websh/src/generic/modwebsh_cgi.c
Index: modwebsh_cgi.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/modwebsh_cgi.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- modwebsh_cgi.c 19 Apr 2002 06:52:04 -0000 1.6
+++ modwebsh_cgi.c 11 Sep 2002 13:54:01 -0000 1.7
@@ -106,7 +106,7 @@
/* these options should be in sync with the options in Web_Cfg
* not the order or anything, but the actual text strings */
- static char *subCmd[] = {
+ static TCLCONST char *subCmd[] = {
"script",
"server_root",
"document_root",
1.10 +4 -4 tcl-websh/src/generic/paramlist.c
Index: paramlist.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/paramlist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- paramlist.c 20 Mar 2002 16:02:54 -0000 1.9
+++ paramlist.c 11 Sep 2002 13:54:01 -0000 1.10
@@ -19,7 +19,7 @@
#include "log.h"
#include "hashutl.h"
-static char *paramsubcmd[] =
+static TCLCONST char *paramsubcmd[] =
{ "-count", "-unset", "-set", "-lappend", "-names", NULL };
enum paramsubcmd
{ PARAM_COUNT, PARAM_UNSET, PARAM_SET, PARAM_LAPPEND, PARAM_NAMES };
@@ -55,13 +55,13 @@
po = i;
i = 0;
while (paramsubcmd[i]) {
- allopts[po] = paramsubcmd[i];
+ allopts[po] = (char *) paramsubcmd[i];
po++;
i++;
}
allopts[po] = NULL;
- if (Tcl_GetIndexFromObj(interp, objCopy, allopts, msg, flags, indexPtr) ==
+ if (Tcl_GetIndexFromObj(interp, objCopy, (TCLCONST char **)allopts, msg, flags, indexPtr) ==
TCL_OK) {
if (*indexPtr < numprivateopts) {
Tcl_DecrRefCount(objCopy);
1.16 +5 -5 tcl-websh/src/generic/request.c
Index: request.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/request.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- request.c 11 Sep 2002 09:14:06 -0000 1.15
+++ request.c 11 Sep 2002 13:54:01 -0000 1.16
@@ -318,7 +318,7 @@
Tcl_Obj *tclo = NULL;
RequestData *requestData = NULL;
- static char *params[] = { "-path", "-prefix", "-remove", NULL };
+ static TCLCONST char *params[] = { "-path", "-prefix", "-remove", NULL };
enum params
{ PATH, PREFIX, REMOVE };
int idx = -1;
@@ -329,7 +329,7 @@
WebAssertArgs(interp, objc, objv, params, idx, -1);
/* do we see "-remove" ? */
- if (argKeyExists(objc, objv, params[REMOVE]) == TCL_OK) {
+ if (argKeyExists(objc, objv, (char *)params[REMOVE]) == TCL_OK) {
/* do remove */
return removeTempFiles(interp, requestData);
@@ -339,8 +339,8 @@
* this works beause argValueOfKey may return NULL and
* tempFileName takes NULL as "default" */
tclo = tempFileName(interp, requestData,
- argValueOfKey(objc, objv, params[PATH]),
- argValueOfKey(objc, objv, params[PREFIX]));
+ argValueOfKey(objc, objv, (char *)params[PATH]),
+ argValueOfKey(objc, objv, (char *)params[PREFIX]));
if (tclo == NULL)
return TCL_ERROR;
1.7 +2 -2 tcl-websh/src/generic/response_ap.c
Index: response_ap.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/response_ap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- response_ap.c 7 Mar 2002 11:26:47 -0000 1.6
+++ response_ap.c 11 Sep 2002 13:54:01 -0000 1.7
@@ -81,7 +81,7 @@
LOG_MSG(interp, WRITE_LOG,
__FILE__, __LINE__,
"web::put", WEBLOG_ERROR,
- Tcl_GetStringResult(interp), NULL);
+ (char *) Tcl_GetStringResult(interp), NULL);
return TCL_ERROR;
}
1.7 +3 -3 tcl-websh/src/generic/uricode.c
Index: uricode.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/uricode.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- uricode.c 28 Dec 2001 16:47:58 -0000 1.6
+++ uricode.c 11 Sep 2002 13:54:01 -0000 1.7
@@ -139,7 +139,7 @@
int length;
Tcl_Obj *res = NULL;
- char *utf = NULL;
+ TCLCONST char *utf = NULL;
Tcl_UniChar unic;
char buf[3];
@@ -160,7 +160,7 @@
if (!(utf[0] & 0x80) && utf[0] != 0) {
/* case: %[7bit] */
- buf[0] = utf[0];
+ buf[0] = (char) utf[0];
utf = Tcl_UtfNext(utf);
if (!(utf[0] & 0x80) && utf[0] != 0) {
1.7 +7 -7 tcl-websh/src/generic/url.c
Index: url.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/url.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- url.c 12 Feb 2002 09:36:29 -0000 1.6
+++ url.c 11 Sep 2002 13:54:01 -0000 1.7
@@ -32,7 +32,7 @@
scheme = paramListGetObjectByString(interp,urlData->requestData->request,key);
-static char *urlElementOpts[] = {
+static TCLCONST char *urlElementOpts[] = {
"-scheme",
"-host",
"-port",
@@ -199,7 +199,7 @@
int i = -1;
int res = 0;
- char *accepted[20];
+ TCLCONST char *accepted[20];
enum urlElement e;
@@ -472,7 +472,7 @@
Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[])
{
- static char *params[] = { "-urlformat",
+ static TCLCONST char *params[] = { "-urlformat",
"-notimestamp", NULL
};
enum params
@@ -527,7 +527,7 @@
* check for flags
* ----------------------------------------------------------------------- */
urlformat = urlData->urlformat;
- if ((urlFmt = argValueOfKey(objc, objv, params[URLFORMAT])) != NULL) {
+ if ((urlFmt = argValueOfKey(objc, objv, (char *)params[URLFORMAT])) != NULL) {
urlformat = parseUrlFormat(interp, urlFmt);
@@ -535,7 +535,7 @@
return TCL_ERROR;
}
- if (argIndexOfKey(objc, objv, params[NOTIMESTAMP]) > 0)
+ if (argIndexOfKey(objc, objv, (char *)params[NOTIMESTAMP]) > 0)
flag = (flag | WEB_URL_NOTIMESTAMP);
Tcl_GetBooleanFromObj(interp, urlData->requestData->cmdUrlTimestamp, &bool);
@@ -754,7 +754,7 @@
int res;
for (i = SCHEME; i <= QUERYSTRING; i++)
- params[i] = urlElementOpts[i];
+ params[i] = (char *) urlElementOpts[i];
params[URLCFGRESET] = "-reset";
params[URLCFGURLFORMAT] = "-urlformat";
1.4 +2 -2 tcl-websh/src/generic/varchannel.c
Index: varchannel.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/varchannel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- varchannel.c 25 Oct 2001 17:50:13 -0000 1.3
+++ varchannel.c 11 Sep 2002 13:54:01 -0000 1.4
@@ -95,7 +95,7 @@
* output to var channel
* ------------------------------------------------------------------------- */
int varchannelOutputProc(ClientData clientData,
- char *buf, int toWrite, int *errorCodePtr)
+ TCLCONST char *buf, int toWrite, int *errorCodePtr)
{
VarChannel *varChannel = NULL;
1.6 +2 -2 tcl-websh/src/generic/weboutint.c
Index: weboutint.c
===================================================================
RCS file: /home/cvs/tcl-websh/src/generic/weboutint.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- weboutint.c 25 Jul 2002 14:27:57 -0000 1.5
+++ weboutint.c 11 Sep 2002 13:54:01 -0000 1.6
@@ -640,7 +640,7 @@
LOG_MSG(interp, WRITE_LOG,
__FILE__, __LINE__,
"web::put", WEBLOG_ERROR,
- Tcl_GetStringResult(interp), NULL);
+ (char *) Tcl_GetStringResult(interp), NULL);
return TCL_ERROR;
}
/* add all occurrences of this header */
---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org