* unix/dltest/pkg[a-e].c: Cleaned up test packages [Bug: 2293]

1 files changed, 34 insertions, 29 deletions

diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index 8780b47..7c91405 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -2,7 +2,7 @@
  * pkgd.c --
  *
  *	This file contains a simple Tcl package "pkgd" that is intended
- *	for testing the Tcl dynamic loading facilities.  It can be used
+ *	for testing the Tcl dynamic loading facilities.	 It can be used
  *	in both safe and unsafe interpreters.
  *
  * Copyright (c) 1995 Sun Microsystems, Inc.
@@ -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: pkgd.c,v 1.3 1999/03/11 21:47:40 stanton Exp $
+ * RCS: @(#) $Id: pkgd.c,v 1.4 2000/04/04 08:06:07 hobbs Exp $
  */
 
 #include "tcl.h"
@@ -19,15 +19,15 @@
  * Prototypes for procedures defined later in this file:
  */
 
-static int	Pkgd_SubCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
-static int	Pkgd_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
-		    Tcl_Interp *interp, int argc, char **argv));
+static int    Pkgd_SubObjCmd _ANSI_ARGS_((ClientData clientData,
+		Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]));
+static int    Pkgd_UnsafeObjCmd _ANSI_ARGS_((ClientData clientData,
+		Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[]));
 
 /*
  *----------------------------------------------------------------------
  *
- * Pkgd_SubCmd --
+ * Pkgd_SubObjCmd --
  *
  *	This procedure is invoked to process the "pkgd_sub" Tcl command.
  *	It expects two arguments and returns their difference.
@@ -42,24 +42,23 @@ static int	Pkgd_UnsafeCmd _ANSI_ARGS_((ClientData clientData,
  */
 
 static int
-Pkgd_SubCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
+Pkgd_SubObjCmd(dummy, interp, objc, objv)
+    ClientData dummy;		/* Not used. */
+    Tcl_Interp *interp;		/* Current interpreter. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj * CONST objv[];	/* Argument objects. */
 {
     int first, second;
 
-    if (argc != 3) {
-	Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
-		" num num\"", (char *) NULL);
+    if (objc != 3) {
+	Tcl_WrongNumArgs(interp, 1, objv, "num num");
 	return TCL_ERROR;
     }
-    if ((Tcl_GetInt(interp, argv[1], &first) != TCL_OK)
-	    || (Tcl_GetInt(interp, argv[2], &second) != TCL_OK)) {
+    if ((Tcl_GetIntFromObj(interp, objv[1], &first) != TCL_OK)
+	    || (Tcl_GetIntFromObj(interp, objv[2], &second) != TCL_OK)) {
 	return TCL_ERROR;
     }
-    sprintf(interp->result, "%d", first - second);
+    Tcl_SetObjResult(interp, Tcl_NewIntObj(first - second));
     return TCL_OK;
 }
 
@@ -81,13 +80,13 @@ Pkgd_SubCmd(dummy, interp, argc, argv)
  */
 
 static int
-Pkgd_UnsafeCmd(dummy, interp, argc, argv)
-    ClientData dummy;			/* Not used. */
-    Tcl_Interp *interp;			/* Current interpreter. */
-    int argc;				/* Number of arguments. */
-    char **argv;			/* Argument strings. */
+Pkgd_UnsafeObjCmd(dummy, interp, objc, objv)
+    ClientData dummy;		/* Not used. */
+    Tcl_Interp *interp;		/* Current interpreter. */
+    int objc;			/* Number of arguments. */
+    Tcl_Obj * CONST objv[];	/* Argument objects. */
 {
-    interp->result = "unsafe command invoked";
+    Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1));
     return TCL_OK;
 }
 
@@ -122,10 +121,10 @@ Pkgd_Init(interp)
     if (code != TCL_OK) {
 	return code;
     }
-    Tcl_CreateCommand(interp, "pkgd_sub", Pkgd_SubCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
-    Tcl_CreateCommand(interp, "pkgd_unsafe", Pkgd_UnsafeCmd, (ClientData) 0,
-	    (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "pkgd_sub", Pkgd_SubObjCmd,
+	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
+    Tcl_CreateObjCommand(interp, "pkgd_unsafe", Pkgd_UnsafeObjCmd,
+	    (ClientData) 0, (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }
 
@@ -151,10 +150,16 @@ Pkgd_SafeInit(interp)
     Tcl_Interp *interp;		/* Interpreter in which the package is
 				 * to be made available. */
 {
+    int code;
+
     if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) {
 	return TCL_ERROR;
     }
-    Tcl_CreateCommand(interp, "pkgd_sub", Pkgd_SubCmd, (ClientData) 0,
+    code = Tcl_PkgProvide(interp, "Pkgd", "7.3");
+    if (code != TCL_OK) {
+	return code;
+    }
+    Tcl_CreateObjCommand(interp, "pkgd_sub", Pkgd_SubObjCmd, (ClientData) 0,
 	    (Tcl_CmdDeleteProc *) NULL);
     return TCL_OK;
 }