diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-05-18 22:57:23 +0200 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2021-05-18 23:01:30 +0200 |
| commit | 5c66a1a30064edcd4c617ccfe54e28a08878050a (patch) | |
| tree | ead6c48545fd36c9a6a0628e667f6e8fce4b13fa | |
| parent | f87ce01441881cbb3093e3ddace875c0ed23e595 (diff) | |
| download | gcc-5c66a1a30064edcd4c617ccfe54e28a08878050a.zip gcc-5c66a1a30064edcd4c617ccfe54e28a08878050a.tar.gz gcc-5c66a1a30064edcd4c617ccfe54e28a08878050a.tar.bz2 | |
d: Use filename_ncmp instead of strncmp
gcc/d/ChangeLog:
* d-incpath.cc (prefixed_path): Use filename_ncmp instead of strncmp.
| -rw-r--r-- | gcc/d/d-incpath.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/gcc/d/d-incpath.cc b/gcc/d/d-incpath.cc index 8b7c435..d863929 100644 --- a/gcc/d/d-incpath.cc +++ b/gcc/d/d-incpath.cc @@ -30,11 +30,9 @@ along with GCC; see the file COPYING3. If not see static char * prefixed_path (const char *path, const char *iprefix) { - size_t len; - - if (cpp_relocated () && (len = cpp_PREFIX_len) != 0) + if (cpp_relocated () && cpp_PREFIX_len != 0) { - if (!strncmp (path, cpp_PREFIX, len)) + if (!filename_ncmp (path, cpp_PREFIX, cpp_PREFIX_len)) { static const char *relocated_prefix; /* If this path starts with the configure-time prefix, @@ -52,14 +50,14 @@ prefixed_path (const char *path, const char *iprefix) free (dummy); } - return concat (relocated_prefix, path + len, NULL); + return concat (relocated_prefix, path + cpp_PREFIX_len, NULL); } } - if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0) + if (iprefix && cpp_GCC_INCLUDE_DIR_len != 0) { - if (!strncmp (path, cpp_GCC_INCLUDE_DIR, len)) - return concat (iprefix, path + len, NULL); + if (!filename_ncmp (path, cpp_GCC_INCLUDE_DIR, cpp_GCC_INCLUDE_DIR_len)) + return concat (iprefix, path + cpp_GCC_INCLUDE_DIR_len, NULL); } return xstrdup (path); |