Replace use of index() with Ustrchr()

diff --git a/src/src/malware.c b/src/src/malware.c
index 04b5887e7308ca1bf2edff60df3102b61cd2627a..93bcf8667d5588050ea5b5e73e28b4c39dafc7f6 100644 (file)
--- a/src/src/malware.c
+++ b/src/src/malware.c
@@ -1443,9 +1443,9 @@ malware_internal(uschar **listptr, uschar *eml_filename, BOOL faking)
        if ((sockline_scanner = string_nextinlist(&av_scanner_work, &sep,
                                            NULL, 0)))
        {       /* check for no expansions apart from one %s */
        if ((sockline_scanner = string_nextinlist(&av_scanner_work, &sep,
                                            NULL, 0)))
        {       /* check for no expansions apart from one %s */

-         char * s = index(CS sockline_scanner, '%');
+         uschar * s = Ustrchr(sockline_scanner, '%');

          if (s++)
          if (s++)

-           if ((*s != 's' && *s != '%') || index(s+1, '%'))
+           if ((*s != 's' && *s != '%') || Ustrchr(s+1, '%'))

              return m_errlog_defer_3(scanent,
                                    US"unsafe sock scanner call spec", sock);
        }
              return m_errlog_defer_3(scanent,
                                    US"unsafe sock scanner call spec", sock);
        }