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 2007/02/12 15:02:28 UTC

svn commit: r506449 - in /tcl/websh/trunk/src: ./ generic/

Author: ronnie
Date: Mon Feb 12 06:02:27 2007
New Revision: 506449

URL: http://svn.apache.org/viewvc?view=rev&rev=506449
Log:
- removed unused local variables to allow warning-free compile with -Wall
 - removed some redundant variable initializations
Thanks to Mikhail Teterin for pointing these out

Modified:
    tcl/websh/trunk/src/ChangeLog
    tcl/websh/trunk/src/generic/args.c
    tcl/websh/trunk/src/generic/checksum.c
    tcl/websh/trunk/src/generic/conv.c
    tcl/websh/trunk/src/generic/crypt.c
    tcl/websh/trunk/src/generic/dispatch.c
    tcl/websh/trunk/src/generic/filecounter.c
    tcl/websh/trunk/src/generic/filelock.c
    tcl/websh/trunk/src/generic/filelock.h
    tcl/websh/trunk/src/generic/formdata.c
    tcl/websh/trunk/src/generic/htmlify.c
    tcl/websh/trunk/src/generic/interpool.c
    tcl/websh/trunk/src/generic/log.c
    tcl/websh/trunk/src/generic/logutl.c
    tcl/websh/trunk/src/generic/mod_websh.c
    tcl/websh/trunk/src/generic/modwebsh_ap.c
    tcl/websh/trunk/src/generic/nca_d.c
    tcl/websh/trunk/src/generic/paramlist.c
    tcl/websh/trunk/src/generic/request.c
    tcl/websh/trunk/src/generic/request_ap.c
    tcl/websh/trunk/src/generic/uricode.c
    tcl/websh/trunk/src/generic/webout.c
    tcl/websh/trunk/src/generic/weboutint.c

Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Mon Feb 12 06:02:27 2007
@@ -1,3 +1,19 @@
+2007-02-12 Brunner Ronnie <ro...@netcetera.ch>
+
+	* src/generic/dispatch.c, src/generic/crypt.c, src/generic/logutl.c, 
+	src/generic/htmlify.c, src/generic/formdata.c, src/generic/checksum.c,
+	src/generic/conv.c, src/generic/request_ap.c, src/generic/interpool.c,
+	src/generic/weboutint.c, src/generic/request.c,
+	src/generic/modwebsh_ap.c, src/generic/nca_d.c,
+	src/generic/mod_websh.c, src/generic/uricode.c, src/generic/webout.c,
+	src/generic/filecounter.c, src/generic/log.c, src/generic/filelock.c,
+	src/generic/filelock.h, generic/paramlist.c, src/generic/args.c:
+	Adapted patch from Mikhail Teterin <mi...@aldan.algebra.com>
+	- Removed unused local variables to allow compile w/o complaints 
+	  when using -Wall -Werror
+	- Removed some redundant initialization of variables
+        Thanks Mikhail
+	
 2007-01-03 Brunner Ronnie <ro...@netcetera.ch>
 
 	* src/win/Makefile:

Modified: tcl/websh/trunk/src/generic/args.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/args.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/args.c (original)
+++ tcl/websh/trunk/src/generic/args.c Mon Feb 12 06:02:27 2007
@@ -72,7 +72,7 @@
 
 	if (tmpLen > 1) {
 	    if (tmp[1] != '-') {
-		if (isdigit(tmp[1]))
+		if (isdigit((int)tmp[1]))
 		    return OPTION_TYPE_NUMBER;
 		return OPTION_TYPE_PARAM;
 	    }
@@ -94,7 +94,6 @@
 {
 
     int pos = 0;
-    char *tmp = NULL;
 
     for (pos = (previous + 1); pos < objc; pos++) {
 
@@ -309,7 +308,6 @@
 
     int i;
     char *tmp = NULL;
-    int tmpLen = -1;
 
     if (scanc < 0)
 	scanc = objc;

Modified: tcl/websh/trunk/src/generic/checksum.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/checksum.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/checksum.c (original)
+++ tcl/websh/trunk/src/generic/checksum.c Mon Feb 12 06:02:27 2007
@@ -84,7 +84,6 @@
     Tcl_Obj *tmp = NULL;
     char tmpc1 = 0;
     char tmpc2 = 0;
-    int i = 0;
     unsigned char byte = 0;
 
     tmp = Tcl_NewObj();
@@ -143,8 +142,7 @@
 {
 
     Tcl_Obj *crcObj = NULL;
-    char *str = NULL;
-    int len = 0;
+    int len;
     int crc1;
     int crc2;
 

Modified: tcl/websh/trunk/src/generic/conv.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/conv.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/conv.c (original)
+++ tcl/websh/trunk/src/generic/conv.c Mon Feb 12 06:02:27 2007
@@ -162,8 +162,7 @@
 {
 
     ConvData *convData = NULL;
-    Tcl_Obj *res1 = NULL;
-    Tcl_Obj *res2 = NULL;
+    Tcl_Obj *res1;
 
     /* --------------------------------------------------------------------------
      * check for private data

Modified: tcl/websh/trunk/src/generic/crypt.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/crypt.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/crypt.c (original)
+++ tcl/websh/trunk/src/generic/crypt.c Mon Feb 12 06:02:27 2007
@@ -25,9 +25,8 @@
 int crypt_Init(Tcl_Interp * interp)
 {
 
-    CryptData *cryptData = NULL;
-    int ires = 0;
-    Tcl_Obj *tmp = NULL;
+    CryptData *cryptData;
+    Tcl_Obj *tmp;
 
     /* --------------------------------------------------------------------------
      * interpreter running ?

Modified: tcl/websh/trunk/src/generic/dispatch.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/dispatch.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/dispatch.c (original)
+++ tcl/websh/trunk/src/generic/dispatch.c Mon Feb 12 06:02:27 2007
@@ -54,11 +54,8 @@
     };
 
     int idx = 0;
-    Tcl_Obj *post_data = NULL;
-    Tcl_Obj *query_string = NULL;
-    Tcl_Obj *formDataChannel = NULL;
-    Tcl_Obj *formDataBoundary = NULL;
-    Tcl_Obj *urlEncString = NULL;
+    Tcl_Obj *post_data;
+    Tcl_Obj *query_string;
 
     /* --------------------------------------------------------------------------
      * check for private data
@@ -407,8 +404,7 @@
 		  Tcl_Obj * len, Tcl_Obj * type, RequestData * requestData)
 {
 
-    char *content_type = NULL;
-    int iTmp = 0;
+    char *content_type;
 
 /*   printf("DBG parsePostData - starting\n"); fflush(stdout); */
 

Modified: tcl/websh/trunk/src/generic/filecounter.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/filecounter.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/filecounter.c (original)
+++ tcl/websh/trunk/src/generic/filecounter.c Mon Feb 12 06:02:27 2007
@@ -58,9 +58,8 @@
     static TCLCONST char *subCommands[] = { "curval", "nextval", "getval", "config", NULL };
     enum subCommands
     { CURVAL, NEXTVAL, GETVAL, CONFIG };
-    char **ptr = (char **) subCommands;
 
-    int idx;
+    int idx = 0;
     int seqno;
     Tcl_Obj *result = NULL;
 

Modified: tcl/websh/trunk/src/generic/filelock.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/filelock.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/filelock.c (original)
+++ tcl/websh/trunk/src/generic/filelock.c Mon Feb 12 06:02:27 2007
@@ -24,9 +24,7 @@
 {
 
     int res = -1;
-    int filedes = -1;
-
-    filedes = (int) handle;
+    int filedes = (int)(intptr_t)handle;
 
 #ifdef SYSV
     /* since lockf takes size as argument,
@@ -68,9 +66,7 @@
 {
 
     int res = -1;
-    int filedes = -1;
-
-    filedes = (int) handle;
+    int filedes = (int)(intptr_t)handle;
 
 #ifdef SYSV
     /* since lockf takes size as argument,
@@ -105,10 +101,8 @@
 int unlock_file(ClientData handle)
 {
 
-    int res = 0;
-    int filedes = -1;
-
-    filedes = (int) handle;
+    int res = -1;
+    int filedes = (int)(intptr_t)handle;
 
 #ifdef SYSV
     /* since lockf takes size as argument,
@@ -146,7 +140,6 @@
 {
 
     ClientData handle;
-    int res = 0;
 
     if (Tcl_GetChannelHandle(channel, TCL_WRITABLE, &handle) != TCL_OK) {
 
@@ -174,7 +167,6 @@
 {
 
     ClientData handle;
-    int res = 0;
 
     if (Tcl_GetChannelHandle(channel, TCL_WRITABLE, &handle) != TCL_OK) {
 	LOG_MSG(interp, WRITE_LOG, __FILE__, __LINE__,
@@ -243,7 +235,6 @@
 
     Tcl_Channel channel;
     ClientData handle;
-    int res = 0;
 
     WebAssertObjc(objc != 2, 1, "channel");
 

Modified: tcl/websh/trunk/src/generic/filelock.h
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/filelock.h?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/filelock.h (original)
+++ tcl/websh/trunk/src/generic/filelock.h Mon Feb 12 06:02:27 2007
@@ -23,6 +23,8 @@
 #endif
 #ifdef WIN32
 #  include <windows.h>
+/* intptr_t needed for 64 Bit platforms -> dummy in Win32*/
+typedef	int	intptr_t;
 #endif
 #ifdef FREEBSD
 #    include <unistd.h>

Modified: tcl/websh/trunk/src/generic/formdata.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/formdata.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/formdata.c (original)
+++ tcl/websh/trunk/src/generic/formdata.c Mon Feb 12 06:02:27 2007
@@ -562,7 +562,6 @@
     long rBytes = 0;
     long rBytesPrev = 0;
     long wBytes = 0;
-    char *tmpCurLine = NULL;
 
     /* --------------------------------------------------------------------------
      * sanity

Modified: tcl/websh/trunk/src/generic/htmlify.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/htmlify.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/htmlify.c (original)
+++ tcl/websh/trunk/src/generic/htmlify.c Mon Feb 12 06:02:27 2007
@@ -265,15 +265,12 @@
 int webDeHtmlify(ConvData * convData, Tcl_Obj * in, Tcl_Obj * out)
 {
 
-    int length = 0;		/* length of input */
+    int length;			/* length of input */
     int pos = 0;		/* actual position in string */
-    Tcl_UniChar *unic = NULL;
+    Tcl_UniChar *unic;
     int plainfirst = 0;
     int plainend = 0;
-    int dump = 0;
     int err = 0;		/* temporary use, may be removed */
-
-    Tcl_Obj *err_buffer = NULL;
 
     if (in == NULL || out == NULL) {
 	return TCL_ERROR;

Modified: tcl/websh/trunk/src/generic/interpool.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/interpool.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/interpool.c (original)
+++ tcl/websh/trunk/src/generic/interpool.c Mon Feb 12 06:02:27 2007
@@ -108,7 +108,6 @@
 {
 
     int result = 0;
-    time_t t = 0;
     LogPlugIn *logtoap = NULL;
     Tcl_Obj *code = NULL;
 
@@ -306,7 +305,6 @@
     Tcl_HashEntry *entry = NULL;
     WebInterp *found = NULL;
     WebInterpClass *webInterpClass = NULL;
-    LogToApData *logToApData = NULL;
     char *id = NULL;
     Tcl_Obj *idObj = NULL;
     Tcl_Obj *mapCmd = NULL;

Modified: tcl/websh/trunk/src/generic/log.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/log.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/log.c (original)
+++ tcl/websh/trunk/src/generic/log.c Mon Feb 12 06:02:27 2007
@@ -434,15 +434,13 @@
 	    Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[])
 {
 
-    LogData *logData = NULL;
-    int iTmp = 0;
-    int iCur = 0;
+    LogData *logData;
 
     /* ------------------------------------------------------------------------
      * check for internal data
      * --------------------------------------------------------------------- */
-    WebAssertData(interp, clientData, "Web_Log", TCL_ERROR)
-	logData = (LogData *) clientData;
+    WebAssertData(interp, clientData, "Web_Log", TCL_ERROR);
+    logData = (LogData *) clientData;
 
     /* ------------------------------------------------------------------------
      * try to be fast
@@ -696,8 +694,6 @@
 	}
     case DELETE:{
 
-	    LogDest *logDest = NULL;
-
 	    /*      0               1      2 */
 	    /*      web::loglogDest delete logDest1 */
 
@@ -892,8 +888,6 @@
 	    break;
 	}
     case DELETE:{
-
-	    LogLevel *logLevel = NULL;
 
 	    /*      0              1      2 */
 	    /*      web::loglevel delete logLevel1 */

Modified: tcl/websh/trunk/src/generic/logutl.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/logutl.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/logutl.c (original)
+++ tcl/websh/trunk/src/generic/logutl.c Mon Feb 12 06:02:27 2007
@@ -462,7 +462,7 @@
 		    break;
 		case 't':
 #ifdef TCL_THREADS
-		    sprintf(tmpStr, "%d", Tcl_GetCurrentThread());
+		    sprintf(tmpStr, "%d", (int) Tcl_GetCurrentThread());
 		    Tcl_AppendToObj(fmsg, tmpStr, -1);
 #else
 		    /* no thread id */

Modified: tcl/websh/trunk/src/generic/mod_websh.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/mod_websh.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/mod_websh.c (original)
+++ tcl/websh/trunk/src/generic/mod_websh.c Mon Feb 12 06:02:27 2007
@@ -366,9 +366,6 @@
 {
 
     int res;
-    void *sconf = r->server->module_config;
-    websh_server_conf *conf =
-	(websh_server_conf *) ap_get_module_config(sconf, &websh_module);
 
 #ifdef APACHE2
     if (strcmp(r->handler, WEBSHHANDLER))

Modified: tcl/websh/trunk/src/generic/modwebsh_ap.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/modwebsh_ap.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/modwebsh_ap.c (original)
+++ tcl/websh/trunk/src/generic/modwebsh_ap.c Mon Feb 12 06:02:27 2007
@@ -82,7 +82,6 @@
 {
 
     WebInterp *webInterp = (WebInterp *) clientData;
-    int res = 0;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "code");

Modified: tcl/websh/trunk/src/generic/nca_d.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/nca_d.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/nca_d.c (original)
+++ tcl/websh/trunk/src/generic/nca_d.c Mon Feb 12 06:02:27 2007
@@ -258,15 +258,14 @@
 Tcl_Obj *encryptNcaD(Tcl_Interp * interp, ClientData clientData, Tcl_Obj * in)
 {
 
-    Tcl_Obj *out = NULL;
-    int pack = 0, type = 0, prev = 0, newc = 0, pos = 0;
-    Tcl_Obj *key = NULL;
-    unsigned char *keyBytes = NULL;
+    Tcl_Obj *out;
+    int pack, type, prev = 0, newc, pos = 0;
+    Tcl_Obj *key;
+    unsigned char *keyBytes;
     int keyLen = -1;
     char outc;
-    Tcl_Obj *tmp = NULL;
-    int i = 0;
-    char *str = NULL;
+    int i;
+    char *str;
     int strLen = -1;
 
     if ((clientData == NULL) || (in == NULL))

Modified: tcl/websh/trunk/src/generic/paramlist.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/paramlist.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/paramlist.c (original)
+++ tcl/websh/trunk/src/generic/paramlist.c Mon Feb 12 06:02:27 2007
@@ -85,9 +85,8 @@
 int paramListSet(ParamList * hash, char *key, Tcl_Obj * value)
 {
 
-    Tcl_Obj *existingValue = NULL;
-    Tcl_Obj *copy = NULL;
-    int len = 0;
+    Tcl_Obj *existingValue;
+    Tcl_Obj *copy;
 
     if ((hash == NULL) || (key == NULL) || (value == NULL))
 	return TCL_ERROR;
@@ -537,7 +536,7 @@
     Tcl_HashEntry *he;
 
     if (hash != NULL) {
-	while (he = Tcl_FirstHashEntry(hash, &hs)) {
+	while ((he = Tcl_FirstHashEntry(hash, &hs))) {
 	    tclo = (Tcl_Obj *) Tcl_GetHashValue(he);
 	    if (tclo != NULL)
 		Tcl_DecrRefCount(tclo);

Modified: tcl/websh/trunk/src/generic/request.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/request.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/request.c (original)
+++ tcl/websh/trunk/src/generic/request.c Mon Feb 12 06:02:27 2007
@@ -444,14 +444,12 @@
 		Tcl_Interp * interp, int objc, Tcl_Obj * CONST objv[])
 {
 
-    int idx = -1;
-
     static char *params[] = { "-reset", "-channel", NULL };
     enum params
     { REQUESTRESET, DEFAULTCHANNELNAME };
 
-    int res = 0;
-    RequestData *requestData = NULL;
+    int res;
+    RequestData *requestData;
 
     /* --------------------------------------------------------------------------
      * sanity

Modified: tcl/websh/trunk/src/generic/request_ap.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/request_ap.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/request_ap.c (original)
+++ tcl/websh/trunk/src/generic/request_ap.c Mon Feb 12 06:02:27 2007
@@ -39,7 +39,6 @@
 int requestFillRequestValues(Tcl_Interp * interp, RequestData * requestData)
 {
 
-    int res = 0;
     /*Tcl_Obj *reso = NULL;*/
     request_rec *r = NULL;
 #ifndef APACHE2

Modified: tcl/websh/trunk/src/generic/uricode.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/uricode.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/uricode.c (original)
+++ tcl/websh/trunk/src/generic/uricode.c Mon Feb 12 06:02:27 2007
@@ -79,14 +79,12 @@
 Tcl_Obj *uriEncode(Tcl_Obj * inString)
 {
 
-    long length = 0;
-    long i = 0;
-    char str[32];		/* for hex representation of i. 64 bit -> string
-				   with 16 chars. 32 should be long enough, then. */
-    Tcl_Obj *tclo = NULL;
-    char *utfs = NULL;
-    Tcl_UniChar unic = 0;
-    unsigned char *bytes = NULL;
+    long i;
+    char str[32];	/* for hex representation of i. 64 bit -> string
+			   with 16 chars. 32 should be long enough, then. */
+    Tcl_Obj *tclo;
+    Tcl_UniChar unic;
+    unsigned char *bytes;
     int bytesLen = -1;
 
     IfNullLogRetNull(NULL, inString, "uriEncode: got NULL as input.");

Modified: tcl/websh/trunk/src/generic/webout.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/webout.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/webout.c (original)
+++ tcl/websh/trunk/src/generic/webout.c Mon Feb 12 06:02:27 2007
@@ -263,9 +263,8 @@
 		return resetOutData(interp, outData);
 
 	    case RESET:{
-		    Tcl_Obj *tmp = NULL;
-		    int err = 0;
-		    char *tname = NULL;
+		    Tcl_Obj *tmp;
+		    char *tname;
 
 		    WebAssertObjc(objc != 2, 2, NULL);
 

Modified: tcl/websh/trunk/src/generic/weboutint.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/weboutint.c?view=diff&rev=506449&r1=506448&r2=506449
==============================================================================
--- tcl/websh/trunk/src/generic/weboutint.c (original)
+++ tcl/websh/trunk/src/generic/weboutint.c Mon Feb 12 06:02:27 2007
@@ -28,8 +28,6 @@
 Tcl_Channel getChannel(Tcl_Interp * interp, ResponseObj * responseObj)
 {
 
-    char *varName = NULL;
-    char *channelName = NULL;
     int mode = 0;
     Tcl_Channel channel = NULL;
 
@@ -133,18 +131,12 @@
 {
 
     Tcl_HashTable *hash = NULL;
-    ResponseObj *responseObj = NULL;
-    int err = 0;
-    int mode = 0;
-    char *name = NULL;
-    Tcl_Obj *tmp = NULL;
-    Tcl_Obj *tmp2 = NULL;
+    ResponseObj *responseObj;
     char *defheaders[] = { HEADER, NULL };
     int i;
 
     if (channelName == NULL)
 	return NULL;
-    name = channelName;
 
 /*   fprintf(stderr,"creating '%s'\n",channelName); fflush(stderr); */
 
@@ -173,8 +165,8 @@
     i = 0;
 
     while (defheaders[i]) {
-	char *key = NULL;
-	Tcl_Obj *val = NULL;
+	char *key;
+	Tcl_Obj *val;
 
 	key = defheaders[i++];
 	val = Tcl_NewStringObj(defheaders[i++], -1);
@@ -185,7 +177,7 @@
     responseObj->sendHeader = 1;
     responseObj->bytesSent = 0;
     responseObj->headers = hash;
-    responseObj->name = Tcl_NewStringObj(name, -1);
+    responseObj->name = Tcl_NewStringObj(channelName, -1);
     responseObj->httpresponse = NULL;
     responseObj->headerHandler = headerHandler;
 
@@ -351,9 +343,8 @@
 int destroyOutData(ClientData clientData, Tcl_Interp * interp)
 {
 
-    OutData *outData = NULL;
+    OutData *outData;
     /* HashTableIterator iterator; */
-    ResponseObj *responseObj = NULL;
 
     if (clientData == NULL)
 	return TCL_ERROR;
@@ -383,7 +374,7 @@
   int startseqlen = strlen(strstart);
   int begin = 1;
   int firstScan = 1;
-  int inside = 0, p = 0;
+  int inside = 0;
   int inLen = 0;
   int res = 0;
 



---------------------------------------------------------------------
To unsubscribe, e-mail: websh-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: websh-cvs-help@tcl.apache.org