diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-01 19:51:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-01 19:51:28 (GMT) |
| commit | 7747ac024f699006066d1eb7919fab3f7715d835 (patch) | |
| tree | 14e48d160d21d4a4b84a7a47545b914f6f1962c0 /generic/tclCmdAH.c | |
| parent | 24ce75e998f13506548f2bebeb361405aa16546f (diff) | |
| parent | a01324b87773322006055cac9ff0da9bdae34d4b (diff) | |
| download | tcl-7747ac024f699006066d1eb7919fab3f7715d835.zip tcl-7747ac024f699006066d1eb7919fab3f7715d835.tar.gz tcl-7747ac024f699006066d1eb7919fab3f7715d835.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tclCmdAH.c')
| -rw-r--r-- | generic/tclCmdAH.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/generic/tclCmdAH.c b/generic/tclCmdAH.c index 4292224..6dfc705 100644 --- a/generic/tclCmdAH.c +++ b/generic/tclCmdAH.c @@ -629,24 +629,26 @@ EncodingDirsObjCmd( int objc, /* Number of arguments. */ Tcl_Obj *const objv[]) /* Argument objects. */ { + Tcl_Obj *dirListObj; + if (objc > 3) { - Tcl_WrongNumArgs(interp, 1, objv, "?dirList?"); + Tcl_WrongNumArgs(interp, 2, objv, "?dirList?"); return TCL_ERROR; } - objc -= 1; - objv += 1; - if (objc == 1) { + if (objc == 2) { Tcl_SetObjResult(interp, Tcl_GetEncodingSearchPath()); return TCL_OK; } - if (Tcl_SetEncodingSearchPath(objv[1]) == TCL_ERROR) { + + dirListObj = objv[2]; + if (Tcl_SetEncodingSearchPath(dirListObj) == TCL_ERROR) { Tcl_AppendResult(interp, "expected directory list but got \"", - TclGetString(objv[1]), "\"", NULL); + TclGetString(dirListObj), "\"", NULL); Tcl_SetErrorCode(interp, "TCL", "OPERATION", "ENCODING", "BADPATH", NULL); return TCL_ERROR; } - Tcl_SetObjResult(interp, objv[1]); + Tcl_SetObjResult(interp, dirListObj); return TCL_OK; } |