[Cmake-commits] CMake branch, next, updated. v3.7.0-rc1-263-ge8ce847
Brad King
brad.king at kitware.com
Sat Oct 8 05:28:06 EDT 2016
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via e8ce84727ed59d55c37adbf06cde0e2f114c46e1 (commit)
via c22f3cf7153fcf766d0ecc17d72e93bf4209e0b2 (commit)
via bf28a3873d633d233991f14e8e4d10c76f410deb (commit)
from 1035d0e0d270301d266f2d20b39bf09fa3448972 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e8ce84727ed59d55c37adbf06cde0e2f114c46e1
commit e8ce84727ed59d55c37adbf06cde0e2f114c46e1
Merge: 1035d0e c22f3cf
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 8 05:28:05 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 8 05:28:05 2016 -0400
Merge topic 'update-kwsys' into next
c22f3cf7 Merge branch 'upstream-KWSys' into update-kwsys
bf28a387 KWSys 2016-10-07 (dfe9b386)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c22f3cf7153fcf766d0ecc17d72e93bf4209e0b2
commit c22f3cf7153fcf766d0ecc17d72e93bf4209e0b2
Merge: b99bbfe bf28a38
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 8 05:25:35 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sat Oct 8 05:25:35 2016 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-10-07 (dfe9b386)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf28a3873d633d233991f14e8e4d10c76f410deb
commit bf28a3873d633d233991f14e8e4d10c76f410deb
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Fri Oct 7 13:41:32 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sat Oct 8 05:25:34 2016 -0400
KWSys 2016-10-07 (dfe9b386)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit dfe9b38635d80cb5253187c1ddf90923e1b9effd (master).
Upstream Shortlog
-----------------
Brad King (1):
dfe9b386 SystemTools: Re-implement Strucmp
diff --git a/SystemTools.cxx b/SystemTools.cxx
index c97af25..5da715f 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2716,17 +2716,15 @@ unsigned long SystemTools::FileLength(const std::string& filename)
return length;
}
-int SystemTools::Strucmp(const char *s1, const char *s2)
-{
- // lifted from Graphvis http://www.graphviz.org
- while ((*s1 != '\0')
- && (tolower(*s1) == tolower(*s2)))
- {
- s1++;
- s2++;
- }
-
- return tolower(*s1) - tolower(*s2);
+int SystemTools::Strucmp(const char* l, const char* r)
+{
+ int lc;
+ int rc;
+ do {
+ lc = tolower(*l++);
+ rc = tolower(*r++);
+ } while(lc == rc && lc);
+ return lc - rc;
}
// return file's modified time
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/SystemTools.cxx | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list