summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-22 17:07:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-03-22 17:07:01 (GMT)
commit6c6a470c2bc258d42f224373a084ee2a4d61e9a6 (patch)
tree5fde96ac0d14b163451029af0097528d7e687230
parent3b6d7d61197cc6d63dd33e9527c54a013546a8e2 (diff)
downloadtcl-6c6a470c2bc258d42f224373a084ee2a4d61e9a6.zip
tcl-6c6a470c2bc258d42f224373a084ee2a4d61e9a6.tar.gz
tcl-6c6a470c2bc258d42f224373a084ee2a4d61e9a6.tar.bz2
Rename MODULESCOPE TclGetLoadedPackagesEx() to TclGetLoadedLibraries()
-rw-r--r--generic/tclCmdIL.c2
-rw-r--r--generic/tclInt.h2
-rw-r--r--generic/tclLoad.c4
-rw-r--r--generic/tclStubInit.c2
-rw-r--r--library/safe.tcl4
5 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclCmdIL.c b/generic/tclCmdIL.c
index beb55c0..d3588aa 100644
--- a/generic/tclCmdIL.c
+++ b/generic/tclCmdIL.c
@@ -1700,7 +1700,7 @@ InfoLoadedCmd(
} else { /* Get pkgs just in specified interp. */
packageName = TclGetString(objv[2]);
}
- return TclGetLoadedPackagesEx(interp, interpName, packageName);
+ return TclGetLoadedLibraries(interp, interpName, packageName);
}
/*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 1d192ff..75167df 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -3044,7 +3044,7 @@ MODULE_SCOPE Tcl_Obj * TclGetSourceFromFrame(CmdFrame *cfPtr, int objc,
Tcl_Obj *const objv[]);
MODULE_SCOPE char * TclGetStringStorage(Tcl_Obj *objPtr,
unsigned int *sizePtr);
-MODULE_SCOPE int TclGetLoadedPackagesEx(Tcl_Interp *interp,
+MODULE_SCOPE int TclGetLoadedLibraries(Tcl_Interp *interp,
const char *targetName,
const char *packageName);
MODULE_SCOPE int TclGetWideBitsFromObj(Tcl_Interp *, Tcl_Obj *,
diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 0fd21c0..afad897 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -1024,7 +1024,7 @@ Tcl_StaticPackage(
/*
*----------------------------------------------------------------------
*
- * TclGetLoadedPackagesEx --
+ * TclGetLoadedLibraries --
*
* This function returns information about all of the files that are
* loaded (either in a particular interpreter, or for all interpreters).
@@ -1043,7 +1043,7 @@ Tcl_StaticPackage(
*/
int
-TclGetLoadedPackagesEx(
+TclGetLoadedLibraries(
Tcl_Interp *interp, /* Interpreter in which to return information
* or error message. */
const char *targetName, /* Name of target interpreter or NULL. If
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index f0056eb..b66af58 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -309,7 +309,7 @@ static int TclGetLoadedPackages(
* otherwise, just return info about this
* interpreter. */
{
- return TclGetLoadedPackagesEx(interp, targetName, NULL);
+ return TclGetLoadedLibraries(interp, targetName, NULL);
}
mp_err TclBN_mp_div_3(const mp_int *a, mp_int *c, unsigned int *d) {
diff --git a/library/safe.tcl b/library/safe.tcl
index 27033b2..3c01f75 100644
--- a/library/safe.tcl
+++ b/library/safe.tcl
@@ -1029,14 +1029,14 @@ proc ::safe::AliasLoad {child file args} {
# Determine what kind of load is requested
if {$file eq ""} {
- # static library loading
+ # static loading
if {$prefix eq ""} {
set msg "load error: empty filename and no prefix"
Log $child $msg
return -code error $msg
}
if {!$state(staticsok)} {
- Log $child "static library loading disabled\
+ Log $child "static loading disabled\
(trying to load $prefix to $target)"
return -code error "permission denied (static library)"
}