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 2010/05/03 18:07:56 UTC

svn commit: r940497 - in /tcl/websh/trunk/src: ChangeLog generic/nca_d.c

Author: ronnie
Date: Mon May  3 16:07:55 2010
New Revision: 940497

URL: http://svn.apache.org/viewvc?rev=940497&view=rev
Log:
- removed redundant logging in web::decryptd

Modified:
    tcl/websh/trunk/src/ChangeLog
    tcl/websh/trunk/src/generic/nca_d.c

Modified: tcl/websh/trunk/src/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/ChangeLog?rev=940497&r1=940496&r2=940497&view=diff
==============================================================================
--- tcl/websh/trunk/src/ChangeLog (original)
+++ tcl/websh/trunk/src/ChangeLog Mon May  3 16:07:55 2010
@@ -1,3 +1,7 @@
+2010-05-03 Brunner Ronnie <ro...@netcetera.ch>
+	* src/generic/nca_d.c:
+	- removed redundant log in web::decryptd (handeled by caller)
+	
 2010-02-25 Brunner Ronnie <ro...@netcetera.ch>
 	* src/generic/logutl.c, src/generic/request_ap.c:
 	- Make -Wall happy (removed unused variables, properly

Modified: tcl/websh/trunk/src/generic/nca_d.c
URL: http://svn.apache.org/viewvc/tcl/websh/trunk/src/generic/nca_d.c?rev=940497&r1=940496&r2=940497&view=diff
==============================================================================
--- tcl/websh/trunk/src/generic/nca_d.c (original)
+++ tcl/websh/trunk/src/generic/nca_d.c Mon May  3 16:07:55 2010
@@ -194,7 +194,7 @@ int Web_DecryptD(ClientData clientData,
     keyBytes = Tcl_GetByteArrayFromObj(key, &keyLen);
 
     if (keyLen < 1) {
-	LOG_MSG(interp, WRITE_LOG | SET_RESULT,
+	LOG_MSG(interp, SET_RESULT,
 		__FILE__, __LINE__,
 		"web::decryptd", WEBLOG_ERROR, "too short key", NULL);
 	return TCL_ERROR;
@@ -219,7 +219,7 @@ int Web_DecryptD(ClientData clientData,
 	tmp = decryptNcaD(key, objv[1]);
 
 	if (tmp == NULL) {
-	    LOG_MSG(interp, WRITE_LOG,
+	    LOG_MSG(interp, SET_RESULT,
 		    __FILE__, __LINE__,
 		    "web::decryptd", WEBLOG_DEBUG, "internal error", NULL);
 	    return TCL_ERROR;
@@ -231,7 +231,9 @@ int Web_DecryptD(ClientData clientData,
 	out = crcCheck(tmp);	/* rturns NULL in case of error */
 
 	if (out == NULL) {
-	    LOG_MSG(interp, WRITE_LOG | SET_RESULT,
+	  /* just set interp result, but don't actually log: will be logged by
+	     caller */
+	    LOG_MSG(interp, SET_RESULT,
 		    __FILE__, __LINE__,
 		    "web::decryptd", WEBLOG_ERROR, "checksum mismatch", NULL);
 



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