diff options
author | Benno Schulenberg <bensberg@telfort.nl> | 2022-07-11 09:16:55 +0200 |
---|---|---|
committer | Benno Schulenberg <bensberg@telfort.nl> | 2022-07-11 09:25:15 +0200 |
commit | 76eed4986b8c94008853c2215408a100b7e95ecb (patch) | |
tree | 137cd1a3d29ffabff25c5bd260e9d6973f71b81c /symbols.c | |
parent | c230cee968c7e7956a04e4d73bd6f23260f435db (diff) |
suppress four more warnings when 'warningLevel' is zero
This addresses issue #20 some more.
Reported-by: Vincent Lefevre
Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
Diffstat (limited to 'symbols.c')
-rw-r--r-- | symbols.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -588,7 +588,7 @@ MergeKeys(SymbolsInfo * info, KeyInfo * into, KeyInfo * from) into->groupInfo = from->groupInfo; into->defs.defined |= _Key_GroupInfo; } - if (collide) + if (collide && (warningLevel > 0)) { WARN("Symbol map for key %s redefined\n", longText(into->name, XkbMessage)); @@ -1537,10 +1537,13 @@ SetExplicitGroup(SymbolsInfo * info, KeyInfo * key) if ((key->typesDefined | key->symsDefined | key->actsDefined) & ~1) { int i; - WARN("For the map %s an explicit group specified\n", info->name); - WARN("but key %s has more than one group defined\n", - longText(key->name, XkbMessage)); - ACTION("All groups except first one will be ignored\n"); + if (warningLevel > 0) + { + WARN("For map %s an explicit group is specified\n", info->name); + WARN("but key %s has more than one group defined\n", + longText(key->name, XkbMessage)); + ACTION("All groups except first one will be ignored\n"); + } for (i = 1; i < XkbNumKbdGroups; i++) { key->numLevels[i] = 0; |