Commit 4346e0065b558a41957bcca670484cbe408717d3
2010-06-15T16:41:10
xkbcomp: keycodes: Silence gcc warnings It was right to warn us: some of these were actually bogus. 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
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index 847cfb8..70bcdbe 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -160,7 +160,6 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
{
IndicatorNameInfo *old;
Bool replace;
- const char *action;
replace = (new->defs.merge == MergeReplace) ||
(new->defs.merge == MergeOverride);
@@ -177,23 +176,22 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
{
if (replace)
old->virtual = new->virtual;
- action = "Using %s instead of %s\n";
+ ACTION("Using %s instead of %s\n",
+ (old->virtual ? "virtual" : "real"),
+ (old->virtual ? "real" : "virtual"));
}
else
{
- action = "Identical definitions ignored\n";
+ ACTION("Identical definitions ignored\n");
}
- ACTION(action, (old->virtual ? "virtual" : "real"),
- (old->virtual ? "real" : "virtual"));
return True;
}
else
{
if (replace)
- action = "Ignoring %d, using %d\n";
+ ACTION("Ignoring %d, using %d\n", old->ndx, new->ndx);
else
- action = "Using %d, ignoring %d\n";
- ACTION(action, old->ndx, new->ndx);
+ ACTION("Using %d, ignoring %d\n", old->ndx, new->ndx);
}
if (replace)
{
@@ -225,7 +223,7 @@ AddIndicatorName(KeyNamesInfo * info, IndicatorNameInfo * new)
{
WARN("Multiple names for indicator %d\n", new->ndx);
if ((old->name == new->name) && (old->virtual == new->virtual))
- action = "Identical definitions ignored\n";
+ ACTION("Identical definitions ignored\n");
else
{
const char *oldType, *newType;