Commit 8904c6eea747628a93afcfc3017df537ab43223c
2010-06-15T15:22:05
xkbcomp: expr: Use XkbcAtomText instead of GetString This returns us a temporary string, rather than leaking the atom. Signed-off-by: Daniel Stone <daniel@fooishbar.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index a6375e1..1a0f8d3 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -167,7 +167,7 @@ SimpleLookup(char * priv,
{
return False;
}
- str = XkbcAtomGetString(field);
+ str = XkbcAtomText(field);
for (entry = (LookupEntry *) priv;
(entry != NULL) && (entry->name != NULL); entry++)
{
@@ -191,7 +191,7 @@ RadioLookup(char * priv,
if ((field == None) || (elem != None) || (type != TypeInt))
return False;
- str = XkbcAtomGetString(field);
+ str = XkbcAtomText(field);
if (str)
{
if (uStrCasePrefix("group", str))
@@ -219,7 +219,7 @@ TableLookup(char * priv,
if ((priv == NULL) || (field == None) || (type != TypeInt))
return False;
- str = XkbcAtomGetString(elem);
+ str = XkbcAtomText(elem);
while (tbl)
{
if (((str == NULL) && (tbl->element == NULL)) ||
@@ -262,6 +262,7 @@ LookupModMask(char * priv,
Atom elem, Atom field, unsigned type, ExprResult * val_rtrn)
{
char *str;
+ Bool ret = True;
if ((elem != None) || (type != TypeInt))
return False;
@@ -280,11 +281,12 @@ LookupModMask(char * priv,
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
@@ -398,7 +400,7 @@ ExprResolveBoolean(ExprDef * expr,
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) ||
@@ -487,8 +489,8 @@ ExprResolveFloat(ExprDef * expr,
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;
@@ -600,8 +602,8 @@ ExprResolveInteger(ExprDef * expr,
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))
{
@@ -1052,7 +1054,7 @@ ExprResolveKeySym(ExprDef * expr,
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;