From 999f3792ac19449764fca224b0741512cc945776 Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Wed, 16 Apr 2014 22:43:30 +0300 Subject: [PATCH] action: convert a few missed unsigned -> enum xkb_action_type Signed-off-by: Ran Benita --- src/xkbcomp/action.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c index eb3d37f..d2baa5f 100644 --- a/src/xkbcomp/action.c +++ b/src/xkbcomp/action.c @@ -103,7 +103,7 @@ enum action_field { ActionsInfo * NewActionsInfo(void) { - unsigned type; + enum xkb_action_type type; ActionsInfo *info; info = calloc(1, sizeof(*info)); @@ -168,7 +168,7 @@ static const LookupEntry fieldStrings[] = { }; static bool -stringToAction(const char *str, unsigned *type_rtrn) +stringToAction(const char *str, enum xkb_action_type *type_rtrn) { return LookupString(actionTypeNames, str, type_rtrn); } @@ -335,7 +335,7 @@ HandleSetLatchLockMods(struct xkb_keymap *keymap, union xkb_action *action, } static bool -CheckGroupField(struct xkb_context *ctx, unsigned action, +CheckGroupField(struct xkb_context *ctx, enum xkb_action_type action, const ExprDef *array_ndx, const ExprDef *value, enum xkb_action_flags *flags_inout, int32_t *group_rtrn) { @@ -621,7 +621,7 @@ HandleSetLockControls(struct xkb_keymap *keymap, union xkb_action *action, struct xkb_controls_action *act = &action->ctrls; if (field == ACTION_FIELD_CONTROLS) { - unsigned int mask; + enum xkb_action_controls mask; if (array_ndx) return ReportActionNotArray(keymap->ctx, action->type, field); @@ -851,7 +851,7 @@ bool SetActionField(struct xkb_keymap *keymap, const char *elem, const char *field, ExprDef *array_ndx, ExprDef *value, ActionsInfo *info) { - unsigned action; + enum xkb_action_type action; enum action_field action_field; if (!stringToAction(elem, &action)) -- 2.7.4