Linting: Recommend os_* instead of POSIX functions.

2 files changed, 27 insertions, 16 deletions

diff --git a/clint.py b/clint.py
index 28b51fbc9c..38bc13df7f 100755
--- a/clint.py
+++ b/clint.py
@@ -1198,18 +1198,28 @@ def CheckForMultilineCommentsAndStrings(filename, clean_lines, linenum, error):
 
 
 threading_list = (
-    ('asctime(', 'asctime_r('),
-    ('ctime(', 'ctime_r('),
-    ('getgrgid(', 'getgrgid_r('),
-    ('getgrnam(', 'getgrnam_r('),
-    ('getlogin(', 'getlogin_r('),
-    ('getpwnam(', 'getpwnam_r('),
-    ('getpwuid(', 'getpwuid_r('),
-    ('gmtime(', 'gmtime_r('),
-    ('localtime(', 'localtime_r('),
-    ('rand(', 'rand_r('),
-    ('strtok(', 'strtok_r('),
-    ('ttyname(', 'ttyname_r('),
+    ('asctime(', 'os_asctime_r('),
+    ('ctime(', 'os_ctime_r('),
+    ('getgrgid(', 'os_getgrgid_r('),
+    ('getgrnam(', 'os_getgrnam_r('),
+    ('getlogin(', 'os_getlogin_r('),
+    ('getpwnam(', 'os_getpwnam_r('),
+    ('getpwuid(', 'os_getpwuid_r('),
+    ('gmtime(', 'os_gmtime_r('),
+    ('localtime(', 'os_localtime_r('),
+    ('strtok(', 'os_strtok_r('),
+    ('ttyname(', 'os_ttyname_r('),
+    ('asctime_r(', 'os_asctime_r('),
+    ('ctime_r(', 'os_ctime_r('),
+    ('getgrgid_r(', 'os_getgrgid_r('),
+    ('getgrnam_r(', 'os_getgrnam_r('),
+    ('getlogin_r(', 'os_getlogin_r('),
+    ('getpwnam_r(', 'os_getpwnam_r('),
+    ('getpwuid_r(', 'os_getpwuid_r('),
+    ('gmtime_r(', 'os_gmtime_r('),
+    ('localtime_r(', 'os_localtime_r('),
+    ('strtok_r(', 'os_strtok_r('),
+    ('ttyname_r(', 'os_ttyname_r('),
     )
 
 
@@ -1235,9 +1245,10 @@ def CheckPosixThreading(filename, clean_lines, linenum, error):
     if ix >= 0 and (ix == 0 or (not line[ix - 1].isalnum() and
                                 line[ix - 1] not in ('_', '.', '>'))):
       error(filename, linenum, 'runtime/threadsafe_fn', 2,
-            'Consider using ' + multithread_safe_function +
+            'Use ' + multithread_safe_function +
             '...) instead of ' + single_thread_function +
-            '...) for improved thread safety.')
+            '...). If it is missing, consider implementing it;' +
+            ' see os_localtime_r for an example.')
 
 
 # Matches invalid increment: *count++, which moves pointer instead of
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index 810ddea82b..b69be88fc7 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -80,11 +80,11 @@ struct tm *os_localtime_r(const time_t *restrict clock,
 {
 #ifdef UNIX
   // POSIX provides localtime_r() as a thread-safe version of localtime().
-  return localtime_r(clock, result);
+  return localtime_r(clock, result);  // NOLINT(runtime/threadsafe_fn)
 #else
   // Windows version of localtime() is thread-safe.
   // See http://msdn.microsoft.com/en-us/library/bf12f0hc%28VS.80%29.aspx
-  struct tm *local_time = localtime(clock);  // NOLINT
+  struct tm *local_time = localtime(clock);  // NOLINT(runtime/threadsafe_fn)
   if (!local_time) {
     return NULL;
   }