{
return False;
}
- str = XkbcAtomGetString(field);
+ str = XkbcAtomText(field);
for (entry = (LookupEntry *) priv;
(entry != NULL) && (entry->name != NULL); entry++)
{
if ((field == None) || (elem != None) || (type != TypeInt))
return False;
- str = XkbcAtomGetString(field);
+ str = XkbcAtomText(field);
if (str)
{
if (uStrCasePrefix("group", str))
if ((priv == NULL) || (field == None) || (type != TypeInt))
return False;
- str = XkbcAtomGetString(elem);
+ str = XkbcAtomText(elem);
while (tbl)
{
if (((str == NULL) && (tbl->element == NULL)) ||
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
char *str;
+ Bool ret = True;
if ((elem != None) || (type != TypeInt))
return False;
if ((lpriv->chain == NULL) ||
(!(*lpriv->chain) (lpriv->chainPriv, elem, field, type,
val_rtrn)))
- return False;
+ ret = False;
}
else
- return False;
- return True;
+ ret = False;
+ free(str);
+ return ret;
}
int
val_rtrn->ival = expr->value.ival;
return True;
case ExprIdent:
- bogus = XkbcAtomGetString(expr->value.str);
+ bogus = XkbcAtomText(expr->value.str);
if (bogus)
{
if ((uStrCaseCmp(bogus, "true") == 0) ||
case ExprValue:
if (expr->type == TypeString)
{
- register char *str;
- str = XkbcAtomGetString(expr->value.str);
+ char *str;
+ str = XkbcAtomText(expr->value.str);
if ((str != NULL) && (strlen(str) == 1))
{
val_rtrn->uval = str[0] * XkbGeomPtsPerMM;
case ExprValue:
if (expr->type == TypeString)
{
- register char *str;
- str = XkbcAtomGetString(expr->value.str);
+ char *str;
+ str = XkbcAtomText(expr->value.str);
if (str != NULL)
switch (strlen(str))
{
if (expr->op == ExprIdent)
{
char *str;
- str = XkbcAtomGetString(expr->value.str);
+ str = XkbcAtomText(expr->value.str);
if ((str != NULL) && ((sym = XkbcStringToKeysym(str)) != NoSymbol))
{
val_rtrn->uval = sym;