summaryrefslogtreecommitdiffstats
path: root/Glob.cxx
diff options
context:
space:
mode:
authorKWSys Upstream <kwrobot@kitware.com>2018-01-23 18:07:33 (GMT)
committerBrad King <brad.king@kitware.com>2018-01-24 19:11:06 (GMT)
commit7a75657084c518a39b192c7ee1568588944677af (patch)
treee425d65299f889b6e5d71be8c21bf3d236cdde85 /Glob.cxx
parent86399e49398cc9e8028e280eee3e89992ab3fd11 (diff)
downloadCMake-7a75657084c518a39b192c7ee1568588944677af.zip
CMake-7a75657084c518a39b192c7ee1568588944677af.tar.gz
CMake-7a75657084c518a39b192c7ee1568588944677af.tar.bz2
KWSys 2018-01-23 (0579db1c)
Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 0579db1c97715f9936523dd473c0ed7613b68e68 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 3e807fd6 cmake: specify source file extensions Brad King (1): 38855ca1 Set CMP0042 explicitly with CMake 3.0 and above Chuck Atkins (1): 4ca97fc6 SystemTools: Disable getpwnam for static linux builds Hans Johnson (1): 7d7f3b2d Configure: Add KWSYS_NULLPTR macro for C++ code Sankhesh Jhaveri (1): 20c458d0 Set CMP0022 policy to new to provide link interface definitions Sean McBride (1): c6829e4d Fixed a few comments, mostly regarding base 2 vs base 10 sizes luz.paz (1): 4b67f965 Remove superfluous double whitespace in appropriate places
Diffstat (limited to 'Glob.cxx')
-rw-r--r--Glob.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/Glob.cxx b/Glob.cxx
index d2f0b85..2b6db78 100644
--- a/Glob.cxx
+++ b/Glob.cxx
@@ -28,7 +28,7 @@
#include <string.h>
namespace KWSYS_NAMESPACE {
#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-// On Windows and apple, no difference between lower and upper case
+// On Windows and Apple, no difference between lower and upper case
#define KWSYS_GLOB_CASE_INDEPENDENT
#endif
@@ -81,13 +81,13 @@ std::string Glob::PatternToRegex(const std::string& pattern,
int c = *i;
if (c == '*') {
// A '*' (not between brackets) matches any string.
- // We modify this to not match slashes since the orignal glob
+ // We modify this to not match slashes since the original glob
// pattern documentation was meant for matching file name
// components separated by slashes.
regex += "[^/]*";
} else if (c == '?') {
// A '?' (not between brackets) matches any single character.
- // We modify this to not match slashes since the orignal glob
+ // We modify this to not match slashes since the original glob
// pattern documentation was meant for matching file name
// components separated by slashes.
regex += "[^/]";
@@ -201,7 +201,7 @@ bool Glob::RecurseDirectory(std::string::size_type start,
}
#if defined(KWSYS_GLOB_CASE_INDEPENDENT)
- // On Windows and apple, no difference between lower and upper case
+ // On Windows and Apple, no difference between lower and upper case
fname = kwsys::SystemTools::LowerCase(fname);
#endif
@@ -430,7 +430,7 @@ void Glob::SetRelative(const char* dir)
const char* Glob::GetRelative()
{
if (this->Relative.empty()) {
- return 0;
+ return KWSYS_NULLPTR;
}
return this->Relative.c_str();
}