[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1629-g25d13b6
Brad King
brad.king at kitware.com
Mon Mar 31 09:41:45 EDT 2014
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 25d13b60b5a2acca6a256a3a75aa33d727f89854 (commit)
via 8c9c4fe1a6d0c660c7e4e4c1af2cdf2e889fbfbd (commit)
via 50ca77f4a03b05c380c923f737e0b3aa00a4cf7d (commit)
from 8e944299a246e2156292919040c2840281f12a81 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25d13b60b5a2acca6a256a3a75aa33d727f89854
commit 25d13b60b5a2acca6a256a3a75aa33d727f89854
Merge: 8e94429 8c9c4fe
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 31 09:41:44 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 31 09:41:44 2014 -0400
Merge topic 'clang-warnings' into next
8c9c4fe1 Remove 'return' statements that can never be reached
50ca77f4 create_test_sourcelist: Initialize variable at declaration
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8c9c4fe1a6d0c660c7e4e4c1af2cdf2e889fbfbd
commit 8c9c4fe1a6d0c660c7e4e4c1af2cdf2e889fbfbd
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Fri Mar 28 11:42:09 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 31 09:41:05 2014 -0400
Remove 'return' statements that can never be reached
Clang -Wunreachable-code-return warns otherwise.
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx b/Source/CursesDialog/cmCursesOptionsWidget.cxx
index 652b2df..d97c737 100644
--- a/Source/CursesDialog/cmCursesOptionsWidget.cxx
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -59,7 +59,6 @@ bool cmCursesOptionsWidget::HandleInput(int& key, cmCursesMainForm*, WINDOW* w)
{
return false;
}
- return false;
}
void cmCursesOptionsWidget::AddOption(std::string const & option )
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index ff05975..2f5f493 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1662,7 +1662,6 @@ long copy_data(struct archive *ar, struct archive *aw)
return (r);
}
}
- return r;
}
bool extract_tar(const char* outFileName, bool verbose,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50ca77f4a03b05c380c923f737e0b3aa00a4cf7d
commit 50ca77f4a03b05c380c923f737e0b3aa00a4cf7d
Author: Sean McBride <sean at rogue-research.com>
AuthorDate: Fri Mar 28 11:10:37 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 31 09:41:05 2014 -0400
create_test_sourcelist: Initialize variable at declaration
Clang -Wconditional-uninitialized warns otherwise.
diff --git a/Templates/TestDriver.cxx.in b/Templates/TestDriver.cxx.in
index 82537ef..0e0a872 100644
--- a/Templates/TestDriver.cxx.in
+++ b/Templates/TestDriver.cxx.in
@@ -58,7 +58,7 @@ static char* lowercase(const char *string)
int main(int ac, char *av[])
{
- int i, NumTests, testNum, partial_match;
+ int i, NumTests, testNum = 0, partial_match;
char *arg, *test_name;
int count;
int testToRun = -1;
@@ -81,7 +81,6 @@ int main(int ac, char *av[])
}
printf("To run a test, enter the test number: ");
fflush(stdout);
- testNum = 0;
if( scanf("%d", &testNum) != 1 )
{
printf("Couldn't parse that input as a number\n");
-----------------------------------------------------------------------
Summary of changes:
Source/CursesDialog/cmCursesOptionsWidget.cxx | 1 -
Source/cmSystemTools.cxx | 1 -
Templates/TestDriver.cxx.in | 3 +--
3 files changed, 1 insertion(+), 4 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list