From 8dd3ddd4e2847e9b1e950a02bc5edcd5313dc76a Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 15 Jul 2003 15:44:51 +0000 Subject: Fixed confusing error message. [Bug 771539] --- ChangeLog | 5 +++++ generic/tclCmdIL.c | 4 ++-- tests/cmdIL.test | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53fdacc..36983de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-15 Donal K. Fellows + + * generic/tclCmdIL.c (SortCompare): Cleared up confusing error + message. [Bug 771539] + 2003-07-15 Daniel Steffen * macosx/Makefile: Rewrote buildsystem for Mac OS X framework build diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c index 48ddefb..d6dbccc 100644 --- a/generic/tclCmdIL.c +++ b/generic/tclCmdIL.c @@ -15,7 +15,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclCmdIL.c,v 1.47.2.1 2003/04/16 23:31:43 dgp Exp $ + * RCS: @(#) $Id: tclCmdIL.c,v 1.47.2.2 2003/07/15 15:44:52 dkf Exp $ */ #include "tclInt.h" @@ -3699,7 +3699,7 @@ SortCompare(objPtr1, objPtr2, infoPtr) Tcl_GetObjResult(infoPtr->interp), &order) != TCL_OK) { Tcl_ResetResult(infoPtr->interp); Tcl_AppendToObj(Tcl_GetObjResult(infoPtr->interp), - "-compare command returned non-numeric result", -1); + "-compare command returned non-integer result", -1); infoPtr->resultCode = TCL_ERROR; return order; } diff --git a/tests/cmdIL.test b/tests/cmdIL.test index 694abbd..6376a12 100644 --- a/tests/cmdIL.test +++ b/tests/cmdIL.test @@ -8,7 +8,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: cmdIL.test,v 1.14 2001/09/28 15:32:17 dkf Exp $ +# RCS: @(#) $Id: cmdIL.test,v 1.14.6.1 2003/07/15 15:44:52 dkf Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest @@ -207,7 +207,7 @@ test cmdIL-3.17 {SortCompare procedure, -command option, non-integer result} { return foow } list [catch {lsort -command cmp {48 6}} msg] $msg -} {1 {-compare command returned non-numeric result}} +} {1 {-compare command returned non-integer result}} test cmdIL-3.18 {SortCompare procedure, -command option} { proc cmp {a b} { expr {$b - $a} -- cgit v0.12