summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-01-18 14:07:40 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-01-18 14:07:40 (GMT)
commit9844b5a37d9de3fc5bff2794df66411a2b76c6e3 (patch)
tree4a33ac545e2bfccb9b51bc46692dc5dc022f3640
parent576ff583b9b5150aedde8eb39bf2f8113a040047 (diff)
downloadtcl-9844b5a37d9de3fc5bff2794df66411a2b76c6e3.zip
tcl-9844b5a37d9de3fc5bff2794df66411a2b76c6e3.tar.gz
tcl-9844b5a37d9de3fc5bff2794df66411a2b76c6e3.tar.bz2
* Overlooked callers of Tcl_GetIndexFromObj
-rw-r--r--ChangeLog7
-rw-r--r--win/tclWinDde.c8
-rw-r--r--win/tclWinReg.c11
3 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d50a6e..7dc25b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-2001-01-18 Daniel Steffen <das@users.sourceforge.net>
+2002-01-18 Don Porter <dgp@users.sourceforge.net>
+
+ * win/tclWinDde.c:
+ * win/tclWinReg.c: Overlooked callers of Tcl_GetIndexFromObj
+
+2002-01-18 Daniel Steffen <das@users.sourceforge.net>
* generic/tclThreadTest.c:
* mac/tclMacChan.c:
diff --git a/win/tclWinDde.c b/win/tclWinDde.c
index 04a306f..80e3070 100644
--- a/win/tclWinDde.c
+++ b/win/tclWinDde.c
@@ -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: tclWinDde.c,v 1.7 2001/08/22 23:56:14 hobbs Exp $
+ * RCS: @(#) $Id: tclWinDde.c,v 1.8 2002/01/18 14:07:40 dgp Exp $
*/
#include "tclPort.h"
@@ -834,11 +834,11 @@ Tcl_DdeObjCmd(
DDE_EVAL
};
- static char *ddeCommands[] = {"servername", "execute", "poke",
+ static CONST char *ddeCommands[] = {"servername", "execute", "poke",
"request", "services", "eval",
(char *) NULL};
- static char *ddeOptions[] = {"-async", (char *) NULL};
- static char *ddeReqOptions[] = {"-binary", (char *) NULL};
+ static CONST char *ddeOptions[] = {"-async", (char *) NULL};
+ static CONST char *ddeReqOptions[] = {"-binary", (char *) NULL};
int index, argIndex;
int async = 0, binary = 0;
int result = TCL_OK;
diff --git a/win/tclWinReg.c b/win/tclWinReg.c
index 5799f86..dee4188 100644
--- a/win/tclWinReg.c
+++ b/win/tclWinReg.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinReg.c,v 1.13 2001/07/19 06:40:09 mdejong Exp $
+ * RCS: @(#) $Id: tclWinReg.c,v 1.14 2002/01/18 14:07:40 dgp Exp $
*/
#include <tclPort.h>
@@ -45,7 +45,7 @@
* to the system predefined keys.
*/
-static char *rootKeyNames[] = {
+static CONST char *rootKeyNames[] = {
"HKEY_LOCAL_MACHINE", "HKEY_USERS", "HKEY_CLASSES_ROOT",
"HKEY_CURRENT_USER", "HKEY_CURRENT_CONFIG",
"HKEY_PERFORMANCE_DATA", "HKEY_DYN_DATA", NULL
@@ -63,7 +63,7 @@ static HKEY rootKeys[] = {
* mapping.
*/
-static char *typeNames[] = {
+static CONST char *typeNames[] = {
"none", "sz", "expand_sz", "binary", "dword",
"dword_big_endian", "link", "multi_sz", "resource_list", NULL
};
@@ -254,8 +254,9 @@ RegistryObjCmd(
int index;
char *errString;
- static char *subcommands[] = { "delete", "get", "keys", "set", "type",
- "values", (char *) NULL };
+ static CONST char *subcommands[] = {
+ "delete", "get", "keys", "set", "type", "values", (char *) NULL
+ };
enum SubCmdIdx { DeleteIdx, GetIdx, KeysIdx, SetIdx, TypeIdx, ValuesIdx };
if (objc < 2) {