From 1054962d4c6968fe6354c9baec6afcca90a7b91c Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Thu, 11 Sep 2014 02:55:51 +0300 Subject: [PATCH] symbols: use darray_foreach_from for nicer loop Signed-off-by: Ran Benita --- src/xkbcomp/symbols.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/xkbcomp/symbols.c b/src/xkbcomp/symbols.c index 5cca1f5..ce19715 100644 --- a/src/xkbcomp/symbols.c +++ b/src/xkbcomp/symbols.c @@ -222,6 +222,7 @@ MergeGroups(SymbolsInfo *info, GroupInfo *into, GroupInfo *from, bool clobber, bool report, xkb_layout_index_t group, xkb_atom_t key_name) { xkb_level_index_t i, levels_in_both; + struct xkb_level *level; /* First find the type of the merged group. */ if (into->type != from->type) { @@ -319,9 +320,9 @@ MergeGroups(SymbolsInfo *info, GroupInfo *into, GroupInfo *from, bool clobber, } } /* If @from has extra levels, get them as well. */ - for (i = levels_in_both; i < darray_size(from->levels); i++) { - darray_append(into->levels, darray_item(from->levels, i)); - darray_item(from->levels, i).num_syms = 0; + darray_foreach_from(level, from->levels, levels_in_both) { + darray_append(into->levels, *level); + level->num_syms = 0; } into->defined |= (from->defined & GROUP_FIELD_ACTS); into->defined |= (from->defined & GROUP_FIELD_SYMS); -- 2.7.4