clang-tidy: Miscellaneous fixes

Author: wismill

.clang-tidy

@@ -16,6 +16,7 @@ Checks:
   - performance-*
   - google-*
   - -google-readability-braces-around-statements
+  - -google-readability-todo
   # - misc-*
   # - -misc-include-cleaner
 # ExtraArgs:
@@ -47,5 +48,6 @@ CheckOptions:
   llvm-else-after-return.WarnOnUnfixable: 'false'
   llvm-qualified-auto.AddConstToQualified: 'false'
   bugprone-suspicious-enum-usage.StrictMode: 'true'
+  bugprone-signed-char-misuse.CharTypdefsToIgnore: 'int8_t'
 SystemHeaders:   false
 ...

bench/bench.c

@@ -127,7 +127,8 @@ predict(long long t1, long long t2, struct estimate *est)
 {
     const long long t = fit(t1, t2);
     est->elapsed = t;
-    est->stdev = truncl(sqrtl((long double)sqr(t1 - t) + (long double)sqr(t2 - 2 * t)));
+    est->stdev =
+        llroundl(sqrtl((long double)sqr(t1 - t) + (long double)sqr(t2 - 2 * t)));
 }
 
 #define high(t, prec) ((t) + (prec))

bench/keysym-case-mappings.c

@@ -55,6 +55,8 @@ main(void)
                     functions[f].toLower(ks);
                     functions[f].toUpper(ks);
                 }
+                /* Avoid dangling pointers
+                 * NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores) */
                 iter = xkb_keysym_iterator_unref(iter);
             }
             bench_stop(&bench);

scripts/update-keysyms-names-handling.py

@@ -175,11 +175,11 @@ def get_keysyms(path: Path) -> dict[int, list[Keysym]]:
 {
     size_t sum = 0;
     for (size_t i = 0; key[i] != '\0'; i++)
-        sum += T[i % $NS] * key[i];
+        sum += (size_t) (T[i % $NS] * key[i]);
     return sum % $NG;
 }
 
-static size_t
+static inline size_t
 keysym_name_perfect_hash(const char *key)
 {
     return (

src/ks_tables.h

@@ -2916,11 +2916,11 @@ keysym_name_hash_f(const char *key, const char *T)
 {
     size_t sum = 0;
     for (size_t i = 0; key[i] != '\0'; i++)
-        sum += T[i % 32] * key[i];
+        sum += (size_t) (T[i % 32] * key[i]);
     return sum % 4857;
 }
 
-static size_t
+static inline size_t
 keysym_name_perfect_hash(const char *key)
 {
     return (

src/scanner-utils.h

@@ -206,8 +206,9 @@ scanner_hex(struct scanner *s, uint8_t *out)
     int i;
     for (i = 0, *out = 0; is_xdigit(scanner_peek(s)) && i < 2; i++) {
         const char c = scanner_next(s);
-        const char offset = (c >= '0' && c <= '9' ? '0' :
-                             c >= 'a' && c <= 'f' ? 'a' - 10 : 'A' - 10);
+        const char offset = (char) (c >= '0' && c <= '9' ? '0' :
+                                    c >= 'a' && c <= 'f' ? 'a' - 10
+                                                         : 'A' - 10);
         *out = *out * 16 + c - offset;
     }
     return i > 0;

src/utf8.c

@@ -22,6 +22,7 @@ utf32_to_utf8(uint32_t unichar, char *buffer)
     int count, shift, length;
     uint8_t head;
 
+    /* NOLINTBEGIN(bugprone-branch-clone) */
     if (unichar <= 0x007f) {
         buffer[0] = (char) unichar;
         buffer[1] = '\0';
@@ -46,6 +47,7 @@ utf32_to_utf8(uint32_t unichar, char *buffer)
     else {
         goto ill_formed_code_unit_subsequence;
     }
+    /* NOLINTEND(bugprone-branch-clone) */
 
     for (count = length - 1, shift = 0; count > 0; count--, shift += 6)
         buffer[count] = (char)(0x80 | ((unichar >> shift) & 0x3f));
@@ -73,6 +75,7 @@ is_valid_utf8(const char *ss, size_t len)
      * We can optimize if needed. */
     while (i < len)
     {
+        /* NOLINTBEGIN(bugprone-branch-clone) */
         if (s[i] <= 0x7F) {
             tail_bytes = 0;
         }
@@ -115,6 +118,7 @@ is_valid_utf8(const char *ss, size_t len)
         else {
             return false;
         }
+        /* NOLINTEND(bugprone-branch-clone) */
 
         i++;
 

src/xkbcomp/keymap.c

@@ -118,6 +118,8 @@ FindInterpForKey(struct xkb_keymap *keymap, const struct xkb_key *key,
                 struct xkb_sym_interpret const **previous_interp;
                 darray_foreach(previous_interp, *interprets) {
                     if (*previous_interp == interp) {
+                        /* Keep as a safeguard against refactoring
+                         * NOLINTNEXTLINE(clang-analyzer-deadcode.DeadStores) */
                         found = false;
                         log_warn(keymap->ctx, XKB_LOG_MESSAGE_NO_ID,
                                  "Repeated interpretation ignored for keysym "

src/xkbcomp/rules.c

@@ -496,14 +496,14 @@ extract_layout_index(const char *s, size_t max_len, xkb_layout_index_t *out)
     }
     /* Numeric index */
 
-#define parse_layout_int_index(s, endptr, index, out)              \
-    char *endptr;                                                  \
-    long index = strtol(&(s)[1], &endptr, 10);                     \
-    if (index < 0 || endptr[0] != ']' || index > XKB_MAX_GROUPS)   \
-        return -1;                                                 \
-    /* To zero-based index. */                                     \
-    *(out) = (xkb_layout_index_t)index - 1;                        \
-    return (int)(endptr - (s) + 1) /* == length "[index]" */
+#define parse_layout_int_index(s, endptr, index, out)                  \
+    char *(endptr);                                                    \
+    long (index) = strtol(&(s)[1], &(endptr), 10);                     \
+    if ((index) < 0 || (endptr)[0] != ']' || (index) > XKB_MAX_GROUPS) \
+        return -1;                                                     \
+    /* To zero-based index. */                                         \
+    *(out) = (xkb_layout_index_t)(index) - 1;                          \
+    return (int)((endptr) - (s) + 1) /* == length "[index]" */
 
     parse_layout_int_index(s, endptr, index, out);
 }
@@ -1135,9 +1135,9 @@ append_expanded_kccgst_value(struct matcher *m, struct scanner *s,
      * Appending +bar to +foo -> +foo+bar
      */
 
-    ch = (darray_empty(expanded) ? '\0' : darray_item(expanded, 0));
+    ch = (char) (darray_empty(expanded) ? '\0' : darray_item(expanded, 0));
     expanded_plus = is_merge_mode_prefix(ch);
-    ch = (darray_empty(*to) ? '\0' : darray_item(*to, 0));
+    ch = (char) (darray_empty(*to) ? '\0' : darray_item(*to, 0));
     to_plus = is_merge_mode_prefix(ch);
 
     if (expanded_plus || darray_empty(*to))

src/xkbcomp/scanner.c

@@ -35,10 +35,14 @@ number(struct scanner *s, int64_t *out, int *out_tok)
     else if (is_float) {
         /* The parser currently just ignores floats, so the cast is
          * fine - the value doesn't matter. */
+        #ifdef __GNUC__
         #pragma GCC diagnostic push
         #pragma GCC diagnostic ignored "-Wbad-function-cast"
+        #endif
         x = (long long int) strtold(start, &end);
+        #ifdef __GNUC__
         #pragma GCC diagnostic pop
+        #endif
     }
     else
         x = strtoll(start, &end, 10);