diff options
Diffstat (limited to 'unix/dltest/pkgd.c')
| -rw-r--r-- | unix/dltest/pkgd.c | 95 |
1 files changed, 44 insertions, 51 deletions
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c index 6e114e9..3fa0aba 100644 --- a/unix/dltest/pkgd.c +++ b/unix/dltest/pkgd.c @@ -1,43 +1,34 @@ -/* +/* * pkgd.c -- * - * This file contains a simple Tcl package "pkgd" that is intended for - * testing the Tcl dynamic loading facilities. It can be used in both - * safe and unsafe interpreters. + * This file contains a simple Tcl package "pkgd" that is intended + * for testing the Tcl dynamic loading facilities. It can be used + * in both safe and unsafe interpreters. * * Copyright (c) 1995 Sun Microsystems, Inc. * - * See the file "license.terms" for information on usage and redistribution of - * this file, and for a DISCLAIMER OF ALL WARRANTIES. + * See the file "license.terms" for information on usage and redistribution + * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ -#undef STATIC_BUILD #include "tcl.h" /* - * TCL_STORAGE_CLASS is set unconditionally to DLLEXPORT because the - * Pkgd_Init declaration is in the source file itself, which is only - * accessed when we are building a library. - */ -#undef TCL_STORAGE_CLASS -#define TCL_STORAGE_CLASS DLLEXPORT - -/* * Prototypes for procedures defined later in this file: */ -static int Pkgd_SubObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); -static int Pkgd_UnsafeObjCmd(ClientData clientData, - Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); +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_SubObjCmd -- * - * This procedure is invoked to process the "pkgd_sub" Tcl command. It - * expects two arguments and returns their difference. + * This procedure is invoked to process the "pkgd_sub" Tcl command. + * It expects two arguments and returns their difference. * * Results: * A standard Tcl result. @@ -49,11 +40,11 @@ static int Pkgd_UnsafeObjCmd(ClientData clientData, */ static int -Pkgd_SubObjCmd( - ClientData dummy, /* Not used. */ - Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ - Tcl_Obj *const objv[]) /* Argument objects. */ +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; @@ -74,8 +65,8 @@ Pkgd_SubObjCmd( * * Pkgd_UnsafeCmd -- * - * This procedure is invoked to process the "pkgd_unsafe" Tcl command. It - * just returns a constant string. + * This procedure is invoked to process the "pkgd_unsafe" Tcl command. + * It just returns a constant string. * * Results: * A standard Tcl result. @@ -87,11 +78,11 @@ Pkgd_SubObjCmd( */ static int -Pkgd_UnsafeObjCmd( - ClientData dummy, /* Not used. */ - Tcl_Interp *interp, /* Current interpreter. */ - int objc, /* Number of arguments. */ - Tcl_Obj *const objv[]) /* Argument objects. */ +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. */ { Tcl_SetObjResult(interp, Tcl_NewStringObj("unsafe command invoked", -1)); return TCL_OK; @@ -102,8 +93,8 @@ Pkgd_UnsafeObjCmd( * * Pkgd_Init -- * - * This is a package initialization procedure, which is called by Tcl - * when this package is to be added to an interpreter. + * This is a package initialization procedure, which is called + * by Tcl when this package is to be added to an interpreter. * * Results: * None. @@ -114,23 +105,24 @@ Pkgd_UnsafeObjCmd( *---------------------------------------------------------------------- */ -EXTERN int -Pkgd_Init( - Tcl_Interp *interp) /* Interpreter in which the package is to be - * made available. */ +int +Pkgd_Init(interp) + Tcl_Interp *interp; /* Interpreter in which the package is + * to be made available. */ { int code; - if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { return TCL_ERROR; } code = Tcl_PkgProvide(interp, "Pkgd", "7.3"); if (code != TCL_OK) { return code; } - Tcl_CreateObjCommand(interp, "pkgd_sub", Pkgd_SubObjCmd, NULL, NULL); - Tcl_CreateObjCommand(interp, "pkgd_unsafe", Pkgd_UnsafeObjCmd, NULL, - 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; } @@ -139,8 +131,8 @@ Pkgd_Init( * * Pkgd_SafeInit -- * - * This is a package initialization procedure, which is called by Tcl - * when this package is to be added to a safe interpreter. + * This is a package initialization procedure, which is called + * by Tcl when this package is to be added to an unsafe interpreter. * * Results: * None. @@ -151,20 +143,21 @@ Pkgd_Init( *---------------------------------------------------------------------- */ -EXTERN int -Pkgd_SafeInit( - Tcl_Interp *interp) /* Interpreter in which the package is to be - * made available. */ +int +Pkgd_SafeInit(interp) + Tcl_Interp *interp; /* Interpreter in which the package is + * to be made available. */ { int code; - if (Tcl_InitStubs(interp, TCL_VERSION, 0) == NULL) { + if (Tcl_InitStubs(interp, TCL_VERSION, 1) == NULL) { return TCL_ERROR; } code = Tcl_PkgProvide(interp, "Pkgd", "7.3"); if (code != TCL_OK) { return code; } - Tcl_CreateObjCommand(interp, "pkgd_sub", Pkgd_SubObjCmd, NULL, NULL); + Tcl_CreateObjCommand(interp, "pkgd_sub", Pkgd_SubObjCmd, (ClientData) 0, + (Tcl_CmdDeleteProc *) NULL); return TCL_OK; } |