Fix lint warnings

diff --git a/.clang-tidy b/.clang-tidy
index 40c2a4e96dbc69978ef8eb668cbfa1271777de81..2ed66e33d26bc7a378967e041c913aca64100fa6 100644 (file)
--- a/.clang-tidy
+++ b/.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.rand,-clang-analyzer-alpha.*,-readability-magic-numbers,-readability-braces-around-statements,-readability-isolate-declaration'
+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.rand,-clang-analyzer-alpha.*,-readability-magic-numbers,-readability-braces-around-statements,-readability-isolate-declaration,-bugprone-narrowing-conversions'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*(?<!lookup3.c)$'
 FormatStyle: 'file'

diff --git a/src/nnn.c b/src/nnn.c
index 52652177e1b8a073d15a9924e1b5acef0b0019cd..8ff177dda6b4e2bdeb7dd7f0558a0fe6d3ed8fa7 100644 (file)
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -888,7 +888,7 @@ static void resetcpind(void)
 /* Initialize curses mode */
 static bool initcurses(void)
 {
-       int i;
+       short i;
 
        if (cfg.picker) {
                if (!newterm(NULL, stderr, stdin)) {
@@ -1385,8 +1385,12 @@ static int entrycmp(const void *va, const void *vb)
        }
 
        /* Do the actual sorting */
-       if (cfg.mtimeorder)
-               return pb->t - pa->t;
+       if (cfg.mtimeorder) {
+               if (pb->t >= pa->t)
+                       return (int)(pb->t - pa->t);
+
+               return -1;
+       }
 
        if (cfg.sizeorder) {
                if (pb->size > pa->size)
@@ -2311,9 +2315,9 @@ static size_t get_fs_info(const char *path, bool type)
                return 0;
 
        if (type == CAPACITY)
-               return svb.f_blocks << ffs(svb.f_bsize >> 1);
+               return svb.f_blocks << ffs((int)(svb.f_bsize >> 1));
 
-       return svb.f_bavail << ffs(svb.f_frsize >> 1);
+       return svb.f_bavail << ffs((int)(svb.f_frsize >> 1));
 }
 
 static bool show_mediainfo(const char *fpath, const char *arg)