112 lines
4.3 KiB
Plaintext
112 lines
4.3 KiB
Plaintext
$OpenBSD: patch-tcl_tcl_db_c,v 1.2 2004/01/14 19:50:15 sturm Exp $
|
|
--- tcl/tcl_db.c.orig 2003-11-21 03:40:27.000000000 +0100
|
|
+++ tcl/tcl_db.c 2004-01-10 11:21:08.000000000 +0100
|
|
@@ -208,7 +208,7 @@ db_Cmd(clientData, interp, objc, objv)
|
|
* defined above.
|
|
*/
|
|
if (Tcl_GetIndexFromObj(interp,
|
|
- objv[1], dbcmds, "command", TCL_EXACT, &cmdindex) != TCL_OK)
|
|
+ objv[1], (CONST84 char **)dbcmds, "command", TCL_EXACT, &cmdindex) != TCL_OK)
|
|
return (IS_HELP(objv[1]));
|
|
|
|
res = NULL;
|
|
@@ -711,7 +711,7 @@ tcl_DbClose(interp, objc, objv, dbp, dbi
|
|
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbclose,
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbclose,
|
|
"option", TCL_EXACT, &optindex) != TCL_OK) {
|
|
arg = Tcl_GetStringFromObj(objv[i], NULL);
|
|
if (arg[0] == '-')
|
|
@@ -826,7 +826,7 @@ tcl_DbPut(interp, objc, objv, dbp)
|
|
if (type == DB_QUEUE || type == DB_RECNO) {
|
|
i = 2;
|
|
while (i < objc - 1) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i++], dbputapp,
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i++], (CONST84 char **)dbputapp,
|
|
"option", TCL_EXACT, &optindex) != TCL_OK)
|
|
continue;
|
|
switch ((enum dbputapp)optindex) {
|
|
@@ -846,7 +846,7 @@ tcl_DbPut(interp, objc, objv, dbp)
|
|
auto_commit = 0;
|
|
while (i < end) {
|
|
if (Tcl_GetIndexFromObj(interp, objv[i],
|
|
- dbputopts, "option", TCL_EXACT, &optindex) != TCL_OK)
|
|
+ (CONST84 char **)dbputopts, "option", TCL_EXACT, &optindex) != TCL_OK)
|
|
return (IS_HELP(objv[i]));
|
|
i++;
|
|
switch ((enum dbputopts)optindex) {
|
|
@@ -1058,7 +1058,7 @@ tcl_DbGet(interp, objc, objv, dbp, ispge
|
|
(void)dbp->get_type(dbp, &type);
|
|
end = objc;
|
|
while (i < end) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbgetopts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbgetopts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
arg = Tcl_GetStringFromObj(objv[i], NULL);
|
|
if (arg[0] == '-') {
|
|
@@ -1617,7 +1617,7 @@ tcl_DbDelete(interp, objc, objv, dbp)
|
|
*/
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbdelopts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbdelopts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
/*
|
|
* If we don't have a -auto_commit, -glob or -txn,
|
|
@@ -1858,7 +1858,7 @@ tcl_DbCursor(interp, objc, objv, dbp, db
|
|
txn = NULL;
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbcuropts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbcuropts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
goto out;
|
|
@@ -1942,7 +1942,7 @@ tcl_DbAssociate(interp, objc, objv, dbp)
|
|
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbaopts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbaopts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
if (result == TCL_OK)
|
|
@@ -2122,7 +2122,7 @@ tcl_DbJoin(interp, objc, objv, dbp, dbcp
|
|
i = 2;
|
|
adj = i;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbjopts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbjopts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
if (result == TCL_OK)
|
|
@@ -2219,7 +2219,7 @@ tcl_DbGetjoin(interp, objc, objv, dbp)
|
|
i = 2;
|
|
adj = i;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbgetjopts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbgetjopts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
if (result == TCL_OK)
|
|
@@ -2582,7 +2582,7 @@ tcl_DbKeyRange(interp, objc, objv, dbp)
|
|
txn = NULL;
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbkeyropts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbkeyropts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
if (result == TCL_OK)
|
|
@@ -2694,7 +2694,7 @@ tcl_DbTruncate(interp, objc, objv, dbp)
|
|
|
|
i = 2;
|
|
while (i < objc) {
|
|
- if (Tcl_GetIndexFromObj(interp, objv[i], dbcuropts, "option",
|
|
+ if (Tcl_GetIndexFromObj(interp, objv[i], (CONST84 char **)dbcuropts, "option",
|
|
TCL_EXACT, &optindex) != TCL_OK) {
|
|
result = IS_HELP(objv[i]);
|
|
goto out;
|