Fix build break

diff --git a/src/.clang-tidy b/src/.clang-tidy
index 32c94b3ca61fa593dac730129390a9143c962936..c90898334c038d31fbc3ef94e2ec492c5720114a 100644 (file)
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,-misc-unused-parameters,google-runtime-int,-llvm-header-guard,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*,-readability-magic-numbers,-readability-braces-around-statements,-readability-function-cognitive-complexity,-readability-identifier-length,-readability-isolate-declaration,-readability-suspicious-call-argument,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-bugprone-reserved-identifier'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,readability-*,modernize-*,bugprone-*,misc-*,-misc-unused-parameters,google-runtime-int,-llvm-header-guard,fuchsia-restrict-system-includes,-clang-analyzer-valist.Uninitialized,-clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling,-clang-analyzer-security.insecureAPI.rand,-clang-analyzer-alpha.*,-modernize-macro-to-enum,-readability-magic-numbers,-readability-braces-around-statements,-readability-function-cognitive-complexity,-readability-identifier-length,-readability-isolate-declaration,-readability-suspicious-call-argument,-bugprone-easily-swappable-parameters,-bugprone-narrowing-conversions,-bugprone-reserved-identifier'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*(?<!lookup3.c)$'
 FormatStyle: 'file'

diff --git a/src/nnn.c b/src/nnn.c
index 58dd15b81ab3675f6b63b4f1284dc2700093c6a7..f1b19dae6941096075d0edb6c45601391b88ec2a 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -6675,7 +6675,7 @@ begin:
                        if (cfgsort[cfg.curctx] == 'z')
                                set_sort_flags('c');
                        if ((!cfgsort[cfg.curctx] || (cfgsort[cfg.curctx] == 'c'))
-                           && ((r = get_kv_key(order, path, maxorder, NNN_ORDER)) > 0)) {
+                           && ((r = get_kv_key(order, path, maxorder, NNN_ORDER)) > 0)) { // NOLINT
                                set_sort_flags(r);
                                cfgsort[cfg.curctx] = 'z';
                        }
@@ -7986,7 +7986,8 @@ static char *load_input(int fd, const char *path)
                total_read += input_read;
 
                while (off < total_read) {
-                       if ((next = memchr(input + off, '\0', total_read - off)) == NULL)
+                       next = memchr(input + off, '\0', total_read - off);
+                       if (!next)
                                break;
                        ++next;