Commit 82de180ede927f132440d0bb64d97851a69bccc5
2012-09-11T15:09:37
Remove unused ExprResolveKeyName The only user was removed in 314965b1. 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
diff --git a/src/xkbcomp/expr.c b/src/xkbcomp/expr.c
index 4ed5cfa..e30d7e2 100644
--- a/src/xkbcomp/expr.c
+++ b/src/xkbcomp/expr.c
@@ -488,51 +488,6 @@ ExprResolveString(struct xkb_context *ctx, const ExprDef *expr,
}
bool
-ExprResolveKeyName(struct xkb_context *ctx, const ExprDef *expr,
- char name[XKB_KEY_NAME_LENGTH])
-{
- switch (expr->op) {
- case EXPR_VALUE:
- if (expr->value_type != EXPR_TYPE_KEYNAME) {
- log_err(ctx, "Found constant of type %s, expected a key name\n",
- expr_value_type_to_string(expr->value_type));
- return false;
- }
- strncpy(name, expr->value.keyName, XKB_KEY_NAME_LENGTH);
- return true;
-
- case EXPR_IDENT:
- log_err(ctx, "Identifier \"%s\" of type string not found\n",
- xkb_atom_text(ctx, expr->value.str));
- return false;
-
- case EXPR_FIELD_REF:
- log_err(ctx, "Default \"%s.%s\" of type key name not found\n",
- xkb_atom_text(ctx, expr->value.field.element),
- xkb_atom_text(ctx, expr->value.field.field));
- return false;
-
- case EXPR_ADD:
- case EXPR_SUBTRACT:
- case EXPR_MULTIPLY:
- case EXPR_DIVIDE:
- case EXPR_ASSIGN:
- case EXPR_NEGATE:
- case EXPR_INVERT:
- case EXPR_NOT:
- case EXPR_UNARY_PLUS:
- log_err(ctx, "%s of key name values not permitted\n",
- expr_op_type_to_string(expr->op));
- return false;
-
- default:
- log_wsgo(ctx, "Unknown operator %d in ResolveKeyName\n", expr->op);
- break;
- }
- return false;
-}
-
-bool
ExprResolveEnum(struct xkb_context *ctx, const ExprDef *expr,
unsigned int *val_rtrn, const LookupEntry *values)
{
diff --git a/src/xkbcomp/expr.h b/src/xkbcomp/expr.h
index e7ed86e..450b6c8 100644
--- a/src/xkbcomp/expr.h
+++ b/src/xkbcomp/expr.h
@@ -81,10 +81,6 @@ ExprResolveString(struct xkb_context *ctx, const ExprDef *expr,
xkb_atom_t *val_rtrn);
bool
-ExprResolveKeyName(struct xkb_context *ctx, const ExprDef *expr,
- char name[XKB_KEY_NAME_LENGTH]);
-
-bool
ExprResolveEnum(struct xkb_context *ctx, const ExprDef *expr,
unsigned int *val_rtrn, const LookupEntry *values);