patch 8.0.0109

Problem:    Still checking if memcmp() exists while every system should have
            it now.
Solution:   Remove vim_memcmp().  (James McCoy, closes #1295)

diff --git a/src/config.h.in b/src/config.h.in
index 5baac7d6b5f40bfbc4aac7598db096e77e2e7d3c..38b0ccf53e18a00016cdccf3d23212d427b7ea06 100644 (file)
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -154,7 +154,6 @@
 #undef BAD_GETCWD
 
 /* Define if you the function: */
-#undef HAVE_BCMP
 #undef HAVE_FCHDIR
 #undef HAVE_FCHOWN
 #undef HAVE_FSEEKO
@@ -170,7 +169,6 @@
 #undef HAVE_ICONV
 #undef HAVE_NL_LANGINFO_CODESET
 #undef HAVE_LSTAT
-#undef HAVE_MEMCMP
 #undef HAVE_MEMSET
 #undef HAVE_MKDTEMP
 #undef HAVE_NANOSLEEP

diff --git a/src/configure.ac b/src/configure.ac
index f6a44691f052f786c861698a702a6bc1e3c3d817..3a31f97bf3712c443c70c4e797a59256b04bb922 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -3594,8 +3594,8 @@ fi
 
 dnl Check for functions in one big call, to reduce the size of configure.
 dnl Can only be used for functions that do not require any include.
-AC_CHECK_FUNCS(bcmp fchdir fchown fsync getcwd getpseudotty \
-       getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat memcmp \
+AC_CHECK_FUNCS(fchdir fchown fsync getcwd getpseudotty \
+       getpwent getpwnam getpwuid getrlimit gettimeofday getwd lstat \
        memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \
        setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \
        sigprocmask sigvec strcasecmp strerror strftime stricmp strncasecmp \

diff --git a/src/misc2.c b/src/misc2.c
index 7f23c43e9a9c23bdbf30f76b188f57306c442b62..baa614db1bb07750d3a652cca84043228fdc0d30 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -1740,27 +1740,6 @@ vim_memset(void *ptr, int c, size_t size)
 }
 #endif
 
-#ifdef VIM_MEMCMP
-/*
- * Return zero when "b1" and "b2" are the same for "len" bytes.
- * Return non-zero otherwise.
- */
-    int
-vim_memcmp(void *b1, void *b2, size_t len)
-{
-    char_u  *p1 = (char_u *)b1, *p2 = (char_u *)b2;
-
-    for ( ; len > 0; --len)
-    {
-       if (*p1 != *p2)
-           return 1;
-       ++p1;
-       ++p2;
-    }
-    return 0;
-}
-#endif
-
 /* skipped when generating prototypes, the prototype is in vim.h */
 #ifdef VIM_MEMMOVE
 /*

diff --git a/src/os_vms_conf.h b/src/os_vms_conf.h
index 5c110f206ebd0aa3df90e0230906ef501b097283..9aa7526e7e51ec8bbf4161cc2ba994910fb49a19 100644 (file)
--- a/src/os_vms_conf.h
+++ b/src/os_vms_conf.h
@@ -101,7 +101,6 @@
 #define HAVE_STRTOL
 #define HAVE_TGETENT
 #define HAVE_MEMSET
-#define HAVE_MEMCMP
 #define HAVE_STRERROR
 #define HAVE_FCHOWN
 #define HAVE_RENAME

diff --git a/src/osdef1.h.in b/src/osdef1.h.in
index a11e6ea501926b4c528191761c189ff874e823b2..5519104c93e6556cba8d7e0a79b712e9238c9c10 100644 (file)
--- a/src/osdef1.h.in
+++ b/src/osdef1.h.in
@@ -50,12 +50,7 @@ extern int   poll(struct pollfd *, long, int);
 #ifdef HAVE_MEMSET
 extern void    *memset(void *, int, size_t);
 #endif
-#ifdef HAVE_BCMP
-extern int     bcmp(void *, void *, size_t);
-#endif
-#ifdef HAVE_MEMCMP
 extern int     memcmp(const void *, const void *, size_t);
-#endif
 #ifdef HAVE_STRPBRK
 extern char    *strpbrk(const char *, const char *);
 #endif

diff --git a/src/search.c b/src/search.c
index cedcad9eb1b6cb79cb8492fe764582aba4360454..36410e50fadc5ab10a5dcf0fa508e58d4d5cb49e 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -1695,7 +1695,8 @@ searchc(cmdarg_T *cap, int t_cmd)
                }
                else
                {
-                   if (vim_memcmp(p + col, lastc_bytes, lastc_bytelen) == 0 && stop)
+                   if (memcmp(p + col, lastc_bytes, lastc_bytelen) == 0
+                                                                      && stop)
                        break;
                }
                stop = TRUE;

diff --git a/src/tag.c b/src/tag.c
index 14fdcf8b0950c3da6496323e2f645efc7cf1ab9d..ecf949858dc1327cad4e0f6fbc1c50f14a8cd382 100644 (file)
--- a/src/tag.c
+++ b/src/tag.c
@@ -2400,7 +2400,7 @@ parse_line:
                              mfp2 = ((struct match_found **)
                                                  (ga_match[mtt].ga_data))[i];
                              if (mfp2->len == mfp->len
-                                     && vim_memcmp(mfp2->match, mfp->match,
+                                     && memcmp(mfp2->match, mfp->match,
                                                       (size_t)mfp->len) == 0)
                                  break;
                              fast_breakcheck();

diff --git a/src/version.c b/src/version.c
index c4977dea746b8f6e32fd8e9852849b8f6300856d..e234f86ab85f403684270207e7a087bdc7de9932 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    109,
 /**/
     108,
 /**/

diff --git a/src/vim.h b/src/vim.h
index d7bf26fe22285079bf8a2564daf00511e84684db..de26c63db49e56c52eda8309086b223902cf1de4 100644 (file)
--- a/src/vim.h
+++ b/src/vim.h
@@ -1733,17 +1733,6 @@ void mch_memmove(void *, void *, size_t);
 void *vim_memset(void *, int, size_t);
 #endif
 
-#ifdef HAVE_MEMCMP
-# define vim_memcmp(p1, p2, len)   memcmp((p1), (p2), (len))
-#else
-# ifdef HAVE_BCMP
-#  define vim_memcmp(p1, p2, len)   bcmp((p1), (p2), (len))
-# else
-int vim_memcmp(void *, void *, size_t);
-#  define VIM_MEMCMP
-# endif
-#endif
-
 #if defined(UNIX) || defined(FEAT_GUI) || defined(VMS) \
        || defined(FEAT_CLIENTSERVER)
 # define USE_INPUT_BUF