summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-05 14:27:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-01-05 14:27:20 (GMT)
commit2ba138980311e60d5317ba5ed8814e11d9c4a997 (patch)
tree33d0914dd38a59968c26095328543dbdcc537eaa
parent52862763d3a3bc08041532e0afc9bf27ef9abbe0 (diff)
downloadtcl-2ba138980311e60d5317ba5ed8814e11d9c4a997.zip
tcl-2ba138980311e60d5317ba5ed8814e11d9c4a997.tar.gz
tcl-2ba138980311e60d5317ba5ed8814e11d9c4a997.tar.bz2
Fix [7c7d3b4481d4e4e86420b54031f4abd1df18d64|7c7d3b4481]: load test failures. There's a difference between "" and NULL as interpreter name.
-rw-r--r--generic/tclCmdIL.c3
-rw-r--r--generic/tclLoad.c42
2 files changed, 21 insertions, 24 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index ec85741..a7a5f43 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -1728,9 +1728,6 @@ InfoLoadedCmd(
interpName = NULL;
} else { /* Get pkgs just in specified interp. */
interpName = TclGetString(objv[1]);
- if (!interpName[0]) {
- interpName = NULL;
- }
}
if (objc < 3) { /* Get loaded files in all packages. */
packageName = NULL;
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index aabe3bb..44085d6 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -1051,7 +1051,7 @@ TclGetLoadedPackagesEx(
* otherwise, just return info about this
* interpreter. */
const char *packageName) /* Package name or NULL. If NULL, return info
- * all packages.
+ * for all packages.
*/
{
Tcl_Interp *target;
@@ -1060,26 +1060,6 @@ TclGetLoadedPackagesEx(
Tcl_Obj *resultObj, *pkgDesc[2];
if (targetName == NULL) {
- /*
- * Return information about all of the available packages.
- */
- if (packageName) {
- resultObj = NULL;
- Tcl_MutexLock(&packageMutex);
- for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
- pkgPtr = pkgPtr->nextPtr) {
- if (!strcmp(packageName, pkgPtr->packageName)) {
- resultObj = Tcl_NewStringObj(pkgPtr->fileName, -1);
- break;
- }
- }
- Tcl_MutexUnlock(&packageMutex);
- if (resultObj) {
- Tcl_SetObjResult(interp, resultObj);
- }
- return TCL_OK;
- }
-
resultObj = Tcl_NewObj();
Tcl_MutexLock(&packageMutex);
for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
@@ -1095,6 +1075,26 @@ TclGetLoadedPackagesEx(
}
/*
+ * Return information about all of the available packages.
+ */
+ if (packageName) {
+ resultObj = NULL;
+ Tcl_MutexLock(&packageMutex);
+ for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
+ pkgPtr = pkgPtr->nextPtr) {
+ if (!strcmp(packageName, pkgPtr->packageName)) {
+ resultObj = Tcl_NewStringObj(pkgPtr->fileName, -1);
+ break;
+ }
+ }
+ Tcl_MutexUnlock(&packageMutex);
+ if (resultObj) {
+ Tcl_SetObjResult(interp, resultObj);
+ }
+ return TCL_OK;
+ }
+
+ /*
* Return information about only the packages that are loaded in a given
* interpreter.
*/