Commit e7b842e1 authored by Daniel Pfeifer's avatar Daniel Pfeifer
Browse files

Make sure unnused parameters are /*named*/

parent e240a7c0
......@@ -259,7 +259,7 @@ int cmCPackArchiveGenerator::PackageFiles()
return 1;
}
int cmCPackArchiveGenerator::GenerateHeader(std::ostream*)
int cmCPackArchiveGenerator::GenerateHeader(std::ostream* /*unused*/)
{
return 1;
}
......
......@@ -50,7 +50,7 @@ static const char* cmDocumentationOptions[][2] = {
{ CM_NULLPTR, CM_NULLPTR }
};
int cpackUnknownArgument(const char*, void*)
int cpackUnknownArgument(const char* /*unused*/, void* /*unused*/)
{
return 1;
}
......
......@@ -19,7 +19,7 @@
#include <cm_expat.h>
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void*,
extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/,
const XML_Char* name,
XML_Encoding* info)
{
......@@ -215,7 +215,7 @@ private:
return true;
}
void StartElement(const std::string& name, const char**) CM_OVERRIDE
void StartElement(const std::string& name, const char** /*atts*/) CM_OVERRIDE
{
this->CData.clear();
if (name == "log") {
......@@ -275,7 +275,7 @@ private:
this->CData.clear();
}
void ReportError(int, int, const char* msg) CM_OVERRIDE
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
{
this->BZR->Log << "Error parsing bzr log xml: " << msg << "\n";
}
......
......@@ -123,14 +123,15 @@ int cmCTestBuildAndTestHandler::RunCMake(std::string* outstring,
return 0;
}
void CMakeMessageCallback(const char* m, const char*, bool&, void* s)
void CMakeMessageCallback(const char* m, const char* /*unused*/,
bool& /*unused*/, void* s)
{
std::string* out = (std::string*)s;
*out += m;
*out += "\n";
}
void CMakeProgressCallback(const char* msg, float, void* s)
void CMakeProgressCallback(const char* msg, float /*unused*/, void* s)
{
std::string* out = (std::string*)s;
*out += msg;
......
......@@ -54,8 +54,8 @@ static size_t curlWriteMemoryCallback(void* ptr, size_t size, size_t nmemb,
return realsize;
}
static size_t curlDebugCallback(CURL*, curl_infotype, char* chPtr, size_t size,
void* data)
static size_t curlDebugCallback(CURL* /*unused*/, curl_infotype /*unused*/,
char* chPtr, size_t size, void* data)
{
std::vector<char>* vec = static_cast<std::vector<char>*>(data);
vec->insert(vec->end(), chPtr, chPtr + size);
......
......@@ -14,7 +14,7 @@
#include "cmCTestScriptHandler.h"
bool cmCTestEmptyBinaryDirectoryCommand::InitialPass(
std::vector<std::string> const& args, cmExecutionStatus&)
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
{
if (args.size() != 1) {
this->SetError("called with incorrect number of arguments");
......
......@@ -261,7 +261,7 @@ private:
return output;
}
void ReportError(int, int, const char* msg) CM_OVERRIDE
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
{
this->HG->Log << "Error parsing hg log xml: " << msg << "\n";
}
......
......@@ -32,7 +32,7 @@ cmCTestHandlerCommand::cmCTestHandlerCommand()
}
bool cmCTestHandlerCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
// Allocate space for argument values.
this->Values.clear();
......
......@@ -78,7 +78,7 @@ public:
ostr << "\n";
this->Log += ostr.str();
}
void EndElement(const std::string&) CM_OVERRIDE {}
void EndElement(const std::string& /*name*/) CM_OVERRIDE {}
const char* GetAttribute(const char* name, const char** atts)
{
......
......@@ -14,7 +14,7 @@
#include "cmCTest.h"
bool cmCTestReadCustomFilesCommand::InitialPass(
std::vector<std::string> const& args, cmExecutionStatus&)
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
......
......@@ -14,7 +14,7 @@
#include "cmCTestScriptHandler.h"
bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->CTestScriptHandler->RunCurrentScript();
......
......@@ -372,7 +372,7 @@ private:
this->CData.clear();
}
void ReportError(int, int, const char* msg) CM_OVERRIDE
void ReportError(int /*line*/, int /*column*/, const char* msg) CM_OVERRIDE
{
this->SVN->Log << "Error parsing svn log xml: " << msg << "\n";
}
......
......@@ -61,7 +61,7 @@ public:
cmCTestScriptFunctionBlocker() {}
~cmCTestScriptFunctionBlocker() CM_OVERRIDE {}
bool IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile& mf,
cmExecutionStatus&) CM_OVERRIDE;
cmExecutionStatus& /*status*/) CM_OVERRIDE;
// virtual bool ShouldRemove(const cmListFileFunction& lff, cmMakefile &mf);
// virtual void ScopeEnded(cmMakefile &mf);
......@@ -69,9 +69,9 @@ public:
};
// simply update the time and don't block anything
bool cmCTestScriptFunctionBlocker::IsFunctionBlocked(const cmListFileFunction&,
cmMakefile&,
cmExecutionStatus&)
bool cmCTestScriptFunctionBlocker::IsFunctionBlocked(
const cmListFileFunction& /*lff*/, cmMakefile& /*mf*/,
cmExecutionStatus& /*status*/)
{
this->CTestScriptHandler->UpdateElapsedTime();
return false;
......@@ -265,7 +265,8 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg)
return retVal;
}
static void ctestScriptProgressCallback(const char* m, float, void* cd)
static void ctestScriptProgressCallback(const char* m, float /*unused*/,
void* cd)
{
cmCTest* ctest = static_cast<cmCTest*>(cd);
if (m && *m) {
......
......@@ -15,7 +15,7 @@
#include <stdlib.h> // required for atoi
bool cmCTestSleepCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
......
......@@ -23,7 +23,7 @@ cmCTestStartCommand::cmCTestStartCommand()
}
bool cmCTestStartCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
......
......@@ -116,7 +116,8 @@ static size_t cmCTestSubmitHandlerWriteMemoryCallback(void* ptr, size_t size,
return realsize;
}
static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL*, curl_infotype,
static size_t cmCTestSubmitHandlerCurlDebugCallback(CURL* /*unused*/,
curl_infotype /*unused*/,
char* chPtr, size_t size,
void* data)
{
......@@ -976,10 +977,9 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(
return true;
}
#else
bool cmCTestSubmitHandler::SubmitUsingXMLRPC(std::string const&,
std::set<std::string> const&,
std::string const&,
std::string const&)
bool cmCTestSubmitHandler::SubmitUsingXMLRPC(
std::string const& /*unused*/, std::set<std::string> const& /*unused*/,
std::string const& /*unused*/, std::string const& /*unused*/)
{
return false;
}
......
......@@ -54,7 +54,7 @@ public:
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&) CM_OVERRIDE;
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
/**
* The name of the command as specified in CMakeList.txt.
......@@ -67,7 +67,7 @@ public:
};
bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
......@@ -135,7 +135,7 @@ public:
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&) CM_OVERRIDE;
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
/**
* The name of the command as specified in CMakeList.txt.
......@@ -148,7 +148,7 @@ public:
};
bool cmCTestAddSubdirectoryCommand::InitialPass(
std::vector<std::string> const& args, cmExecutionStatus&)
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
{
if (args.empty()) {
this->SetError("called with incorrect number of arguments");
......@@ -208,8 +208,8 @@ public:
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const&,
cmExecutionStatus&) CM_OVERRIDE;
bool InitialPass(std::vector<std::string> const& /*args*/,
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
/**
* The name of the command as specified in CMakeList.txt.
......@@ -222,7 +222,7 @@ public:
};
bool cmCTestAddTestCommand::InitialPass(std::vector<std::string> const& args,
cmExecutionStatus&)
cmExecutionStatus& /*unused*/)
{
if (args.size() < 2) {
this->SetError("called with incorrect number of arguments");
......@@ -248,8 +248,8 @@ public:
* This is called when the command is first encountered in
* the CMakeLists.txt file.
*/
bool InitialPass(std::vector<std::string> const&,
cmExecutionStatus&) CM_OVERRIDE;
bool InitialPass(std::vector<std::string> const& /*args*/,
cmExecutionStatus& /*unused*/) CM_OVERRIDE;
/**
* The name of the command as specified in CMakeList.txt.
......@@ -262,7 +262,7 @@ public:
};
bool cmCTestSetTestsPropertiesCommand::InitialPass(
std::vector<std::string> const& args, cmExecutionStatus&)
std::vector<std::string> const& args, cmExecutionStatus& /*unused*/)
{
return this->TestHandler->SetTestsProperties(args);
}
......@@ -986,7 +986,8 @@ void cmCTestTestHandler::ProcessDirectory(std::vector<std::string>& passed,
*this->LogFile << "End testing: " << this->CTest->CurrentTime() << std::endl;
}
void cmCTestTestHandler::GenerateTestCommand(std::vector<std::string>&, int)
void cmCTestTestHandler::GenerateTestCommand(
std::vector<std::string>& /*unused*/, int /*unused*/)
{
}
......
......@@ -185,7 +185,7 @@ bool cmCTestVC::WriteXML(cmXMLWriter& xml)
return result;
}
bool cmCTestVC::WriteXMLUpdates(cmXMLWriter&)
bool cmCTestVC::WriteXMLUpdates(cmXMLWriter& /*unused*/)
{
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT,
"* CTest cannot extract updates for this VCS tool.\n");
......
......@@ -23,7 +23,7 @@ public:
~XMLParser() CM_OVERRIDE {}
protected:
void EndElement(const std::string&) CM_OVERRIDE {}
void EndElement(const std::string& /*name*/) CM_OVERRIDE {}
void StartElement(const std::string& name, const char** atts) CM_OVERRIDE
{
......
......@@ -51,7 +51,7 @@ cmCursesForm* cmCursesForm::CurrentForm = CM_NULLPTR;
extern "C" {
void onsig(int)
void onsig(int /*unused*/)
{
if (cmCursesForm::CurrentForm) {
endwin();
......@@ -70,8 +70,8 @@ void onsig(int)
}
}
void CMakeMessageHandler(const char* message, const char* title, bool&,
void* clientData)
void CMakeMessageHandler(const char* message, const char* title,
bool& /*unused*/, void* clientData)
{
cmCursesForm* self = static_cast<cmCursesForm*>(clientData);
self->AddError(message, title);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment