85 lines
3.2 KiB
Plaintext
85 lines
3.2 KiB
Plaintext
$OpenBSD: patch-tcl_tcl_db_c,v 1.3 2007/10/26 14:06:02 steven Exp $
|
|
--- tcl/tcl_db.c.orig Thu Jun 21 19:46:59 2007
|
|
+++ tcl/tcl_db.c Sat Sep 15 12:39:57 2007
|
|
@@ -209,7 +209,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;
|
|
@@ -878,7 +878,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) {
|
|
@@ -897,7 +897,7 @@ tcl_DbPut(interp, objc, objv, dbp)
|
|
i = 2;
|
|
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) {
|
|
@@ -1116,7 +1116,7 @@ tcl_DbGet(interp, objc, objv, dbp, ispget)
|
|
(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] == '-') {
|
|
@@ -1718,7 +1718,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 -glob or -txn, then the remaining
|
|
@@ -1949,7 +1949,7 @@ tcl_DbCursor(interp, objc, objv, dbp, dbcp)
|
|
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;
|
|
@@ -2061,7 +2061,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)
|
|
@@ -2422,7 +2422,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)
|
|
@@ -2899,7 +2899,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;
|