Allow 3th argument of Itcl_FindC() to be NULL. doc update

Author: jan.nijtmans

doc/List.3

@@ -46,7 +46,7 @@ void
 List info structure.
 .AP Itcl_ListElem *elem in
 List element info structure.
-.AP ClientData clientData in
+.AP void *clientData in
 Arbitrary one-word value to save in the list.
 .BE
 

doc/Object.3

@@ -26,7 +26,7 @@ void
 .SH ARGUMENTS
 .AP Tcl_FreeProc *fproc in
 Address of function to call when the block is to be freed.
-.AP ClientData clientData in
+.AP void *clientData in
 Arbitrary one-word value.
 .BE
 

doc/RegisterC.3

@@ -37,7 +37,7 @@ Name of command.
 .AP Tcl_CmdProc *argProc in
 Implementation of new command:  \fIargProc\fR will be called whenever
 .AP Tcl_CmdProc **argProcPtr in/out
-The Tcl_CmdProc * to receive the pointer.
+The Tcl_CmdProc * to receive the pointer. Can be NULL.
 .AP Tcl_ObjCmdProc *objProc in
 Implementation of the new command: \fIobjProc\fR will be called whenever
 .AP Tcl_ObjCmdProc2 *objProc2 in
@@ -46,10 +46,10 @@ Implementation of the new command: \fIobjProc2\fR will be called whenever
 The Tcl_ObjCmdProc * to receive the pointer.
 .AP Tcl_ObjCmdProc2 **objProc2Ptr in/out
 The Tcl_ObjCmdProc2 * to receive the pointer.
-.AP ClientData clientData in
+.AP void *clientData in
 Arbitrary one-word value to pass to \fIproc\fR and \fIdeleteProc\fR.
-.AP ClientData *cDataPtr in/out
-The ClientData to receive the pointer.
+.AP void **cDataPtr in/out
+The void * to receive the pointer.
 .AP Tcl_CmdDeleteProc *deleteProc in
 Procedure to call before \fIcmdName\fR is deleted from the interpreter;
 allows for command-specific cleanup.  If NULL, then no procedure is

doc/Stack.3

@@ -23,13 +23,13 @@ int
 int
 \fBItcl_PushStack\fR(\fIcdata, stack\fR)
 
-ClientData
+void *
 \fBItcl_PopStack\fR(\fIstack\fR)
 
-ClientData
+void *
 \fBItcl_PeekStack\fR(\fIstack\fR)
 
-ClientData
+void *
 \fBItcl_GetStackValue\fR(\fIstack, pos\fR)
 
 int
@@ -40,7 +40,7 @@ int
 Stack info structure.
 .AP int pos in
 position in stack order from the top.
-.AP ClientData clientData in
+.AP void *clientData in
 Arbitrary one-word value to save in the stack.
 .BE
 

generic/itclDecls.h

@@ -221,6 +221,9 @@ extern const ItclStubs *itclStubsPtr;
 # endif
 # undef Itcl_RegisterObjC2
 # define Itcl_RegisterObjC2 Itcl_RegisterObjC
+# undef Itcl_FindC2
+# define Itcl_FindC2(interp, name, objProcPtr, cDataPtr) \
+	Itcl_FindC(interp, name, NULL, objProcPtr, cDataPtr)
 #endif
 
 #endif /* _ITCLDECLS */

generic/itclLinkage.c

@@ -273,15 +273,15 @@ int
 Itcl_FindC(
     Tcl_Interp *interp,           /* interpreter handling this registration */
     const char *name,             /* symbolic name for procedure */
-    Tcl_CmdProc **argProcPtr,     /* returns (argc,argv) command handler */
+    Tcl_CmdProc **argProcPtr,     /* returns (argc,argv) command handler, can be NULL */
     Tcl_ObjCmdProc **objProcPtr,  /* returns (objc,objv) command handler */
     void **cDataPtr)              /* returns client data */
 {
     Tcl_HashEntry *entry;
     Tcl_HashTable *procTable;
     ItclCfunc *cfunc;
+    Tcl_CmdProc *argProc = NULL;  /* assume info won't be found */
 
-    *argProcPtr = NULL;  /* assume info won't be found */
     *objProcPtr = NULL;
     *cDataPtr   = NULL;
 
@@ -293,13 +293,16 @@ Itcl_FindC(
 	    entry = Tcl_FindHashEntry(procTable, name);
 	    if (entry) {
 		cfunc = (ItclCfunc*)Tcl_GetHashValue(entry);
-		*argProcPtr = cfunc->argCmdProc;
+		argProc = cfunc->argCmdProc;
 		*objProcPtr = cfunc->objCmdProc;
 		*cDataPtr   = cfunc->clientData;
 	    }
 	}
     }
-    return (*argProcPtr != NULL || *objProcPtr != NULL);
+    if (argProcPtr) {
+	*argProcPtr = argProc;
+    }
+    return (((argProcPtr != NULL) && (argProc != NULL)) || (*objProcPtr != NULL));
 }
 
 #if TCL_MAJOR_VERSION > 8
@@ -310,14 +313,13 @@ Itcl_FindC2(
     Tcl_ObjCmdProc2 **objProcPtr, /* returns (objc,objv) command handler */
     void **cDataPtr)              /* returns client data */
 {
-	Tcl_CmdProc *procPtr;
-	Tcl_ObjCmdProc *regProcPtr;
-	void *dataPtr;
+    Tcl_ObjCmdProc *regProcPtr;
+    void *dataPtr;
 
     *objProcPtr = NULL;  /* assume info won't be found */
     *cDataPtr = NULL;
 
-    if (Itcl_FindC(interp, name, &procPtr, &regProcPtr, &dataPtr) == TCL_OK) {
+    if (Itcl_FindC(interp, name, NULL, &regProcPtr, &dataPtr)) {
 	if (regProcPtr == regCmdProc) {
 	    regInfo *info = (regInfo *)dataPtr;
 	    *objProcPtr = info->objProc;
@@ -326,18 +328,6 @@ Itcl_FindC2(
     }
     return (*objProcPtr != NULL);
 }
-#else
-int
-Itcl_FindC2(
-    Tcl_Interp *interp,           /* interpreter handling this registration */
-    const char *name,             /* symbolic name for procedure */
-    Tcl_ObjCmdProc **objProcPtr,  /* returns (objc,objv) command handler */
-    void **cDataPtr)              /* returns client data */
-{
-	Tcl_CmdProc *argProcPtr;
-    return Itcl_FindC(interp, name, &argProcPtr, objProcPtr, cDataPtr);
-}
-
 #endif /* TCL_MAJOR_VERSION */
 
 

generic/itclStubInit.c

@@ -6,6 +6,21 @@
 #include "itclInt.h"
 
 MODULE_SCOPE const ItclStubs itclStubs;
+
+#if TCL_MAJOR_VERSION < 9
+#undef Itcl_FindC2
+#define Itcl_FindC2 findC2
+static int Itcl_FindC2(
+    Tcl_Interp *interp,           /* interpreter handling this registration */
+    const char *name,             /* symbolic name for procedure */
+    Tcl_ObjCmdProc **objProcPtr,  /* returns (objc,objv) command handler */
+    void **cDataPtr)              /* returns client data */
+{
+    return Itcl_FindC(interp, name, NULL, objProcPtr, cDataPtr);
+}
+#endif
+
+
 /* !BEGIN!: Do not edit below this line. */
 
 static const ItclIntStubs itclIntStubs = {