[PATCH v2] xkbtext: fix copy-paste error

Konstantin Kharlamov Hi-Angel at yandex.ru
Sun Mar 24 22:20:15 UTC 2019


As can be seen in diff, nOut is always 0 here. The code was likely
copy-pasted from comparisons further below.

Fixes LGTM warning "Comparison is always false because nOut <= 0."

Signed-off-by: Konstantin Kharlamov <Hi-Angel at yandex.ru>
---

v2: Walter Harms: simplify the code even further by passing the string
to TryCopyStr()

 xkb/xkbtext.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index d2a2567fc..5a2bc5a94 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -966,8 +966,7 @@ CopySetLockControlsArgs(XkbDescPtr xkb, XkbAction *action, char *buf, int *sz)
         int nOut = 0;
 
         if (tmp & XkbRepeatKeysMask) {
-            snprintf(tbuf, sizeof(tbuf), "%sRepeatKeys", (nOut > 0 ? "+" : ""));
-            TryCopyStr(buf, tbuf, sz);
+            TryCopyStr(buf, "RepeatKeys", sz);
             nOut++;
         }
         if (tmp & XkbSlowKeysMask) {
-- 
2.21.0



More information about the xorg-devel mailing list