They've never been used.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
tmp = XkbSA_LatchToLock;
else
return False; /* WSGO! */
- if (!ExprResolveBoolean(value, &result, NULL, NULL))
+ if (!ExprResolveBoolean(value, &result))
return ReportMismatch(action, field, "boolean");
if (result.uval)
*flags_inout |= tmp;
}
else if (field == F_Accel)
{
- if (!ExprResolveBoolean(value, &rtrn, NULL, NULL))
+ if (!ExprResolveBoolean(value, &rtrn))
return ReportMismatch(action->type, field, "boolean");
if (rtrn.uval)
act->flags &= ~XkbSA_NoAcceleration;
{
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
- if (!ExprResolveBoolean(value, &rtrn, NULL, NULL))
+ if (!ExprResolveBoolean(value, &rtrn))
return ReportMismatch(action->type, field, "boolean");
if (rtrn.uval)
act->flags &= ~XkbSA_SwitchApplication;
case F_GenKeyEvent:
if (array_ndx != NULL)
return ReportActionNotArray(action->type, field);
- if (!ExprResolveBoolean(value, &rtrn, NULL, NULL))
+ if (!ExprResolveBoolean(value, &rtrn))
return ReportMismatch(action->type, field, "boolean");
if (rtrn.uval)
act->flags |= XkbSA_MessageGenKeyEvent;
{
if (arrayNdx != NULL)
return ReportSINotArray(si, field, info);
- ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
+ ok = ExprResolveBoolean(value, &tmp);
if (ok)
{
if (tmp.uval)
{
if (arrayNdx != NULL)
return ReportSINotArray(si, field, info);
- ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
+ ok = ExprResolveBoolean(value, &tmp);
if (ok)
{
if (tmp.uval)
int
ExprResolveBoolean(ExprDef * expr,
- ExprResult * val_rtrn,
- IdentLookupFunc lookup, char * lookupPriv)
+ ExprResult * val_rtrn)
{
int ok = 0;
const char *bogus = NULL;
return True;
}
}
- if (lookup)
- {
- ok = (*lookup) (lookupPriv,
- None, expr->value.str, TypeBoolean, val_rtrn);
- }
- if (!ok)
- ERROR("Identifier \"%s\" of type int is unknown\n",
- XkbcAtomText(expr->value.str));
- return ok;
+ ERROR("Identifier \"%s\" of type int is unknown\n",
+ XkbcAtomText(expr->value.str));
+ return False;
case ExprFieldRef:
- if (lookup)
- {
- ok = (*lookup) (lookupPriv,
- expr->value.field.element,
- expr->value.field.field, TypeBoolean, val_rtrn);
- }
- if (!ok)
- ERROR("Default \"%s.%s\" of type boolean is unknown\n",
- XkbcAtomText(expr->value.field.element),
- XkbcAtomText(expr->value.field.field));
- return ok;
+ ERROR("Default \"%s.%s\" of type boolean is unknown\n",
+ XkbcAtomText(expr->value.field.element),
+ XkbcAtomText(expr->value.field.field));
+ return False;
case OpInvert:
case OpNot:
- ok = ExprResolveBoolean(expr, val_rtrn, lookup, lookupPriv);
+ ok = ExprResolveBoolean(expr, val_rtrn);
if (ok)
val_rtrn->uval = !val_rtrn->uval;
return ok;
);
extern int ExprResolveBoolean(ExprDef * /* expr */ ,
- ExprResult * /* val_rtrn */ ,
- IdentLookupFunc /* lookup */ ,
- char * /* lookupPriv */
+ ExprResult * /* val_rtrn */
);
extern int ExprResolveKeyCode(ExprDef * /* expr */ ,
info->errorCount++;
return ReportNotArray("keyboard row", field, rowText(row));
}
- if (!ExprResolveBoolean(value, &tmp, NULL, NULL))
+ if (!ExprResolveBoolean(value, &tmp))
{
info->errorCount++;
return ReportBadType("keyboard row", field, rowText(row),
{
if (arrayNdx != NULL)
return ReportIndicatorNotArray(led, field);
- if (!ExprResolveBoolean(value, &rtrn, NULL, NULL))
+ if (!ExprResolveBoolean(value, &rtrn))
return ReportIndicatorBadType(led, field, "boolean");
if (rtrn.uval)
led->flags &= ~XkbIM_NoExplicit;
{
if (arrayNdx != NULL)
return ReportIndicatorNotArray(led, field);
- if (!ExprResolveBoolean(value, &rtrn, NULL, NULL))
+ if (!ExprResolveBoolean(value, &rtrn))
return ReportIndicatorBadType(led, field, "boolean");
if (rtrn.uval)
led->flags |= XkbIM_LEDDrivesKB;
}
radio_groups |= (1 << (tmp.uval - 1));
}
- if (!ExprResolveBoolean(value, &tmp, NULL, NULL))
+ if (!ExprResolveBoolean(value, &tmp))
{
ERROR("Illegal \"allow none\" value for %s\n",
longText(key->name));
else if ((uStrCaseCmp(field, "groupswrap") == 0) ||
(uStrCaseCmp(field, "wrapgroups") == 0))
{
- ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
+ ok = ExprResolveBoolean(value, &tmp);
if (!ok)
{
ERROR("Illegal groupsWrap setting for %s\n",
else if ((uStrCaseCmp(field, "groupsclamp") == 0) ||
(uStrCaseCmp(field, "clampgroups") == 0))
{
- ok = ExprResolveBoolean(value, &tmp, NULL, NULL);
+ ok = ExprResolveBoolean(value, &tmp);
if (!ok)
{
ERROR("Illegal groupsClamp setting for %s\n",
&& ((uStrCaseCmp(field.str, "groupswrap") == 0)
|| (uStrCaseCmp(field.str, "wrapgroups") == 0)))
{
- if (!ExprResolveBoolean(stmt->value, &tmp, NULL, NULL))
+ if (!ExprResolveBoolean(stmt->value, &tmp))
{
ERROR("Illegal setting for global groupsWrap\n");
ACTION("Non-boolean value ignored\n");
&& ((uStrCaseCmp(field.str, "groupsclamp") == 0)
|| (uStrCaseCmp(field.str, "clampgroups") == 0)))
{
- if (!ExprResolveBoolean(stmt->value, &tmp, NULL, NULL))
+ if (!ExprResolveBoolean(stmt->value, &tmp))
{
ERROR("Illegal setting for global groupsClamp\n");
ACTION("Non-boolean value ignored\n");