Merge remote-tracking branch 'upstream/master' into mix_20240309

1 files changed, 3 insertions, 3 deletions

diff --git a/src/clint.py b/src/clint.py
index 062901b43a..41058469b1 100755
--- a/src/clint.py
+++ b/src/clint.py
@@ -1689,7 +1689,7 @@ def CheckSpacing(filename, clean_lines, linenum, error):
 
         # Look for < that is not surrounded by spaces.  This is only
         # triggered if both sides are missing spaces, even though
-        # technically should should flag if at least one side is missing a
+        # technically should flag if at least one side is missing a
         # space.  This is done to avoid some false positives with shifts.
         match = Search(r'[^\s<]<([^\s=<].*)', reduced_line)
         if (match and not FindNextMatchingAngleBracket(clean_lines, linenum,
@@ -1989,12 +1989,12 @@ def CheckLanguage(filename, clean_lines, linenum, error):
     match = Search(r'\b(strncpy|STRNCPY)\b', line)
     if match:
         error(filename, linenum, 'runtime/printf', 4,
-              'Use xstrlcpy or snprintf instead of %s (unless this is from Vim)'
+              'Use xstrlcpy, xmemcpyz or snprintf instead of %s (unless this is from Vim)'
               % match.group(1))
     match = Search(r'\b(strcpy)\b', line)
     if match:
         error(filename, linenum, 'runtime/printf', 4,
-              'Use xstrlcpy or snprintf instead of %s' % match.group(1))
+              'Use xstrlcpy, xmemcpyz or snprintf instead of %s' % match.group(1))
     match = Search(r'\b(STRNCAT|strncat|strcat|vim_strcat)\b', line)
     if match:
         error(filename, linenum, 'runtime/printf', 4,