summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-07-16 15:28:29 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-07-16 15:28:29 (GMT)
commitedcb9d3655e60d05d4774eef38d89620d0a0e6a1 (patch)
treeaa0e95baba6c5fd8ecb8ae6ff1c49839a8dbd332
parent3bf05e9189615ea7d195ecd15f452092916d278d (diff)
downloadtcl-edcb9d3655e60d05d4774eef38d89620d0a0e6a1.zip
tcl-edcb9d3655e60d05d4774eef38d89620d0a0e6a1.tar.gz
tcl-edcb9d3655e60d05d4774eef38d89620d0a0e6a1.tar.bz2
* generic/tclFileName.c (Tcl_GlobObjCmd): [Bug 771840]
* generic/tclIOUtil.c (Tcl_FSConvertToPathType):[Bug 771947] * unix/tclUnixFCmd.c (GetModeFromPermString): [Bug 771949] Silence compiler warnings about unreached lines.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tclFileName.c3
-rw-r--r--generic/tclIOUtil.c20
-rw-r--r--unix/tclUnixFCmd.c4
4 files changed, 8 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index 84859b0..bbd888a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2003-07-16 Don Porter <dgp@users.sourceforge.net>
+ * generic/tclFileName.c (Tcl_GlobObjCmd): [Bug 771840]
+ * generic/tclIOUtil.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 4a9a0b6..79acfd2 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.40.2.1 2003/04/29 11:45:24 vincentdarley Exp $
+ * RCS: @(#) $Id: tclFileName.c,v 1.40.2.2 2003/07/16 15:28:29 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/tclIOUtil.c b/generic/tclIOUtil.c
index 42f73bd..ca250f6 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.4 2003/05/13 22:55:50 hobbs Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.5 2003/07/16 15:28:29 dgp Exp $
*/
#include "tclInt.h"
@@ -4651,24 +4651,6 @@ Tcl_FSConvertToPathType(interp, objPtr)
return Tcl_ConvertToType(interp, objPtr, &tclFsPathType);
}
return TCL_OK;
- /*
- * This code is intentionally never reached. Once fs-optimisation
- * is complete, it will be removed/replaced
- */
- if (fsPathPtr->cwdPtr == NULL) {
- return TCL_OK;
- } else {
- if (TclFSCwdPointerEquals(fsPathPtr->cwdPtr)) {
- return TCL_OK;
- } else {
- if (objPtr->bytes == NULL) {
- UpdateStringOfFsPath(objPtr);
- }
- FreeFsPathInternalRep(objPtr);
- objPtr->typePtr = NULL;
- return Tcl_ConvertToType(interp, objPtr, &tclFsPathType);
- }
- }
} else {
return Tcl_ConvertToType(interp, objPtr, &tclFsPathType);
}
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index bc9746f..72f6846 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.28 2003/02/10 12:50:31 vincentdarley Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.28.2.1 2003/07/16 15:28:30 dgp Exp $
*
* Portions of this code were derived from NetBSD source code which has
* the following copyright notice:
@@ -1587,7 +1587,6 @@ GetModeFromPermString(interp, modeStringPtr, modePtr)
continue;
default :
return TCL_ERROR;
- break;
}
}
/* what */
@@ -1611,7 +1610,6 @@ GetModeFromPermString(interp, modeStringPtr, modePtr)
break;
default :
return TCL_ERROR;
- break;
}
if (*(modeStringPtr+n+i) == ',') {
i++;