Deprecate (internal) TclVarHashCreateVar() function. It isn't (and shouldn't) be used by any extension.

9 files changed, 22 insertions, 15 deletions

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index 6edebc5..1df01b8 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -384,7 +384,7 @@ Tcl_GetBytesFromObj(
     return baPtr->bytes;
 }
 
-#if !defined(TCL_NO_DEPRECATED)
+#ifndef TCL_NO_DEPRECATED
 unsigned char *
 TclGetBytesFromObj(
     Tcl_Interp *interp,		/* For error reporting */
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 7e5702c..cb49abd 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -529,8 +529,7 @@ declare 233 {
     void TclGetSrcInfoForPc(CmdFrame *contextPtr)
 }
 
-# Exports for VarReform compat: Itcl, XOTcl like to peek into our varTables :(
-declare 234 {
+declare 234 {deprecated {Not used in Tcl, not in any extension any more}} {
     Var *TclVarHashCreateVar(TclVarHashTable *tablePtr, const char *key,
 	    int *newPtr)
 }
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 6d9a09a..60810bb 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -491,7 +491,8 @@ EXTERN int		TclEvalObjEx(Tcl_Interp *interp, Tcl_Obj *objPtr,
 /* 233 */
 EXTERN void		TclGetSrcInfoForPc(CmdFrame *contextPtr);
 /* 234 */
-EXTERN Var *		TclVarHashCreateVar(TclVarHashTable *tablePtr,
+TCL_DEPRECATED("Not used in Tcl, not in any extension any more")
+Var *			TclVarHashCreateVar(TclVarHashTable *tablePtr,
 				const char *key, int *newPtr);
 /* 235 */
 EXTERN void		TclInitVarHashTable(TclVarHashTable *tablePtr,
@@ -813,7 +814,7 @@ typedef struct TclIntStubs {
     int (*tclGetNamespaceFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tcl_Namespace **nsPtrPtr); /* 231 */
     int (*tclEvalObjEx) (Tcl_Interp *interp, Tcl_Obj *objPtr, int flags, const CmdFrame *invoker, int word); /* 232 */
     void (*tclGetSrcInfoForPc) (CmdFrame *contextPtr); /* 233 */
-    Var * (*tclVarHashCreateVar) (TclVarHashTable *tablePtr, const char *key, int *newPtr); /* 234 */
+    TCL_DEPRECATED_API("Not used in Tcl, not in any extension any more") Var * (*tclVarHashCreateVar) (TclVarHashTable *tablePtr, const char *key, int *newPtr); /* 234 */
     void (*tclInitVarHashTable) (TclVarHashTable *tablePtr, Namespace *nsPtr); /* 235 */
     void (*reserved236)(void);
     int (*tclResetCancellation) (Tcl_Interp *interp, int force); /* 237 */
@@ -1272,6 +1273,10 @@ extern const TclIntStubs *tclIntStubsPtr;
 #define TclObjInterpProc TclGetObjInterpProc()
 #define TclObjInterpProc2 TclGetObjInterpProc2()
 
+#ifdef TCL_NO_DEPRECATED
+#   undef TclVarHashCreateVar
+#endif
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 9c9fccc..6d15408 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -232,7 +232,7 @@ MODULE_SCOPE int TclMacOSXMatchType(Tcl_Interp *interp,
 #endif
 
 #if defined(_WIN32)
-#   if !defined(TCL_NO_DEPRECATED)
+#   ifndef TCL_NO_DEPRECATED
 #	define TclWinConvertError Tcl_WinConvertError
 #	define TclWinConvertWSAError Tcl_WinConvertError
 #	define TclWinNToHS ntohs
diff --git a/generic/tclObj.c b/generic/tclObj.c
index 8c58c00..c0231e2 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -1658,7 +1658,7 @@ Tcl_GetString(
  *----------------------------------------------------------------------
  */
 
-#if !defined(TCL_NO_DEPRECATED)
+#ifndef TCL_NO_DEPRECATED
 #undef TclGetStringFromObj
 char *
 TclGetStringFromObj(
@@ -1702,7 +1702,7 @@ TclGetStringFromObj(
     }
     return objPtr->bytes;
 }
-#endif /* !defined(TCL_NO_DEPRECATED) */
+#endif /* !TCL_NO_DEPRECATED */
 
 #undef Tcl_GetStringFromObj
 char *
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index da5ca6c..5f33950 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -641,7 +641,7 @@ TclGetUniChar(
  */
 
 #undef Tcl_GetUnicodeFromObj
-#if !defined(TCL_NO_DEPRECATED)
+#ifndef TCL_NO_DEPRECATED
 Tcl_UniChar *
 TclGetUnicodeFromObj(
     Tcl_Obj *objPtr,		/* The object to find the Unicode string
@@ -669,7 +669,7 @@ TclGetUnicodeFromObj(
     }
     return stringPtr->unicode;
 }
-#endif /* !defined(TCL_NO_DEPRECATED) */
+#endif /* !TCL_NO_DEPRECATED */
 
 Tcl_UniChar *
 Tcl_GetUnicodeFromObj(
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c
index 74c709e..4c87ee8 100644
--- a/generic/tclStubInit.c
+++ b/generic/tclStubInit.c
@@ -70,10 +70,11 @@
 # define Tcl_WinConvertError 0
 #endif
 #undef TclGetStringFromObj
-#if defined(TCL_NO_DEPRECATED)
+#ifdef TCL_NO_DEPRECATED
 # define TclGetStringFromObj 0
 # define TclGetBytesFromObj 0
 # define TclGetUnicodeFromObj 0
+# define TclVarHashCreateVar 0
 #endif
 #undef Tcl_Close
 #define Tcl_Close 0
@@ -86,7 +87,7 @@
 #undef TclListObjGetElements
 #undef TclListObjLength
 
-#if defined(TCL_NO_DEPRECATED)
+#ifdef TCL_NO_DEPRECATED
 # define TclListObjGetElements 0
 # define TclListObjLength 0
 # define TclDictObjSize 0
@@ -95,7 +96,7 @@
 # define TclFSSplitPath 0
 # define TclParseArgsObjv 0
 # define TclGetAliasObj 0
-#else /* !defined(TCL_NO_DEPRECATED) */
+#else /* !TCL_NO_DEPRECATED */
 int TclListObjGetElements(Tcl_Interp *interp, Tcl_Obj *listPtr,
     void *objcPtr, Tcl_Obj ***objvPtr) {
     Tcl_Size n = TCL_INDEX_NONE;
@@ -205,7 +206,7 @@ int TclGetAliasObj(Tcl_Interp *interp, const char *childCmd,
     }
     return result;
 }
-#endif /* !defined(TCL_NO_DEPRECATED) */
+#endif /* !TCL_NO_DEPRECATED */
 
 #define TclBN_mp_add mp_add
 #define TclBN_mp_add_d mp_add_d
diff --git a/generic/tclTest.c b/generic/tclTest.c
index 5f8d2ae..3a6aafc 100644
--- a/generic/tclTest.c
+++ b/generic/tclTest.c
@@ -5747,7 +5747,7 @@ TestbytestringCmd(
     Tcl_Obj *const objv[])	/* The argument objects. */
 {
     struct {
-#if !defined(TCL_NO_DEPRECATED)
+#ifndef TCL_NO_DEPRECATED
 	int n; /* On purpose, not Tcl_Size, in order to demonstrate what happens */
 #else
 	Tcl_Size n;
diff --git a/generic/tclVar.c b/generic/tclVar.c
index 54da881..18b424f 100644
--- a/generic/tclVar.c
+++ b/generic/tclVar.c
@@ -297,6 +297,7 @@ static const Tcl_ObjType parsedVarNameType = {
 	(elem) = irPtr ? (Tcl_Obj *)irPtr->twoPtrValue.ptr2 : NULL;	\
     } while (0)
 
+#ifndef TCL_NO_DEPRECATED
 Var *
 TclVarHashCreateVar(
     TclVarHashTable *tablePtr,
@@ -313,6 +314,7 @@ TclVarHashCreateVar(
 
     return varPtr;
 }
+#endif
 
 static int
 LocateArray(