You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tcl.apache.org by mx...@apache.org on 2019/12/06 10:59:58 UTC
[tcl-rivet] branch uploadcmdfix updated: expanded error info data
in Rivet_Upload
This is an automated email from the ASF dual-hosted git repository.
mxmanghi pushed a commit to branch uploadcmdfix
in repository https://gitbox.apache.org/repos/asf/tcl-rivet.git
The following commit(s) were added to refs/heads/uploadcmdfix by this push:
new 6028291 expanded error info data in Rivet_Upload
6028291 is described below
commit 6028291f38806a920a823553abbfe926be6f5edc
Author: Massimo Manghi <mx...@apache.org>
AuthorDate: Fri Dec 6 11:59:43 2019 +0100
expanded error info data in Rivet_Upload
---
ChangeLog | 3 +++
src/mod_rivet_ng/rivetCore.c | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3de8263..36212c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-12-06 Massimo Manghi <mx...@apache.org>
+ * src/mod_rivet_ng/rivetCore.c: expanded error info data in Rivet_Upload
+
2019-12-04 Massimo Manghi <mx...@apache.org>
* src/mod_rivet_ng/rivetCore.c: new branch uploadcmdfix with improved
argument checking in Rivet_Upload that was the cause of random crashes
diff --git a/src/mod_rivet_ng/rivetCore.c b/src/mod_rivet_ng/rivetCore.c
index 0bc35df..cd34660 100644
--- a/src/mod_rivet_ng/rivetCore.c
+++ b/src/mod_rivet_ng/rivetCore.c
@@ -1112,10 +1112,9 @@ TCL_CMD_HEADER( Rivet_Upload )
Tcl_AppendObjToObj(infoobj,Tcl_NewIntObj(expected_objc));
Tcl_AppendStringsToObj(infoobj," arguments expected");
Tcl_AppendObjToErrorInfo(interp, infoobj);
- Tcl_AddErrorInfo(interp, "Wrong arguments number ");
Tcl_DecrRefCount(infoobj);
- Tcl_WrongNumArgs(interp, objc, objv, "varname");
+ Tcl_WrongNumArgs(interp, objc, objv, "uploadname");
return TCL_ERROR;
}
@@ -1125,7 +1124,9 @@ TCL_CMD_HEADER( Rivet_Upload )
varname = Tcl_GetString(objv[2]);
if (TclWeb_PrepareUpload(varname, private->req) != TCL_OK)
{
- Tcl_AddErrorInfo(interp, "Unable to find variable");
+ Tcl_AddErrorInfo(interp, "Unable to find the upload named '");
+ Tcl_AppendObjToErrorInfo(interp,Tcl_NewStringObj(varname,-1));
+ Tcl_AppendObjToErrorInfo(interp,Tcl_NewStringObj("'",-1));
return TCL_ERROR;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tcl.apache.org
For additional commands, e-mail: commits-help@tcl.apache.org