From a947e7228276a5effd3f3f179cd252a4934426ac Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 16 Jul 2003 15:29:09 +0000 Subject: * generic/tclFileName.c (Tcl_GlobObjCmd): [Bug 771840] * generic/tclPathObj.c (Tcl_FSConvertToPathType):[Bug 771947] * unix/tclUnixFCmd.c (GetModeFromPermString): [Bug 771949] Silence compiler warnings about unreached lines. --- ChangeLog | 5 +++++ generic/tclFileName.c | 3 +-- generic/tclPathObj.c | 4 +++- unix/tclUnixFCmd.c | 4 +--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8675d53..461a72f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-07-16 Don Porter + * generic/tclFileName.c (Tcl_GlobObjCmd): [Bug 771840] + * generic/tclPathObj.c (Tcl_FSConvertToPathType):[Bug 771947] + * unix/tclUnixFCmd.c (GetModeFromPermString): [Bug 771949] + Silence compiler warnings about unreached lines. + * library/tcltest/tcltest.tcl (ProcessFlags): Corrected broken call * library/tcltest/pkgIndex.tcl: to [lrange]. Bumped to version 2.2.4. [Bug 772333] diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 84b92c7..ac28c03 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclFileName.c,v 1.41 2003/04/25 18:28:41 vincentdarley Exp $ + * RCS: @(#) $Id: tclFileName.c,v 1.42 2003/07/16 15:29:09 dgp Exp $ */ #include "tclInt.h" @@ -1680,7 +1680,6 @@ Tcl_GlobObjCmd(dummy, interp, objc, objv) case GLOB_LAST: /* -- */ i++; goto endOfForLoop; - break; } } endOfForLoop: diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 62f5d27..6a6b147 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclPathObj.c,v 1.3 2003/04/16 08:16:23 vincentdarley Exp $ + * RCS: @(#) $Id: tclPathObj.c,v 1.4 2003/07/16 15:29:09 dgp Exp $ */ #include "tclInt.h" @@ -528,6 +528,7 @@ Tcl_FSConvertToPathType(interp, objPtr) * This code is intentionally never reached. Once fs-optimisation * is complete, it will be removed/replaced */ +#if 0 if (fsPathPtr->cwdPtr == NULL) { return TCL_OK; } else { @@ -542,6 +543,7 @@ Tcl_FSConvertToPathType(interp, objPtr) return Tcl_ConvertToType(interp, objPtr, &tclFsPathType); } } +#endif } else { return Tcl_ConvertToType(interp, objPtr, &tclFsPathType); } diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c index 7b26c08..f15b573 100644 --- a/unix/tclUnixFCmd.c +++ b/unix/tclUnixFCmd.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclUnixFCmd.c,v 1.29 2003/05/14 19:21:30 das Exp $ + * RCS: @(#) $Id: tclUnixFCmd.c,v 1.30 2003/07/16 15:29:09 dgp Exp $ * * Portions of this code were derived from NetBSD source code which has * the following copyright notice: @@ -1624,7 +1624,6 @@ GetModeFromPermString(interp, modeStringPtr, modePtr) continue; default : return TCL_ERROR; - break; } } /* what */ @@ -1648,7 +1647,6 @@ GetModeFromPermString(interp, modeStringPtr, modePtr) break; default : return TCL_ERROR; - break; } if (*(modeStringPtr+n+i) == ',') { i++; -- cgit v0.12