kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'clang-warnings' 

af0051f curl, bzip2: Suppress warnings by setting initial value
cb4ec60 cmDocumentation: Fix a few doxygen comment errors
d915819 cm*Lexer: Populate empty doxygen @param comment
97124f9 cmTarget: Properly escape @ char in doxygen comments
8e96353 Fix warnings about \brief usage
d993032 cmGraphVizWriter: Add extra space in comment to suppress warning
6cea3ee cmNewLineStyle: Remove useless semi-colon
7e7a1c0 curl: Fix typo in header include guard
This commit is contained in:
Brad King 2013-10-08 09:53:13 -04:00 committed by CMake Topic Stage
parent cfb2c66f66 af0051f48a
commit 5a364d8ed5
14 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmAddCustomCommandCommand.h
View File

@ -16,9 +16,7 @@
#include "cmDocumentGeneratorExpressions.h" #include "cmDocumentGeneratorExpressions.h"
/** \class cmAddCustomCommandCommand /** \class cmAddCustomCommandCommand
* \brief * \brief cmAddCustomCommandCommand defines a new command (rule) that can
*
* cmAddCustomCommandCommand defines a new command (rule) that can
* be executed within the build process * be executed within the build process
* *
*/ */

4
Source/cmCommandArgumentLexer.cxx
View File

@ -1820,7 +1820,7 @@ void cmCommandArgument_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yysca
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param line_number The line number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmCommandArgument_yyset_lineno (int line_number , yyscan_t yyscanner) void cmCommandArgument_yyset_lineno (int line_number , yyscan_t yyscanner)
@ -1835,7 +1835,7 @@ void cmCommandArgument_yyset_lineno (int line_number , yyscan_t yyscanner)
} }
/** Set the current column. /** Set the current column.
* @param column_no * @param column_no The column number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmCommandArgument_yyset_column (int column_no , yyscan_t yyscanner) void cmCommandArgument_yyset_column (int column_no , yyscan_t yyscanner)

2
Source/cmCreateTestSourceList.h
View File

@ -15,7 +15,7 @@
#include "cmCommand.h" #include "cmCommand.h"
/** \class cmCreateTestSourceList /** \class cmCreateTestSourceList
* \brief * \brief Test driver generation command
* *
*/ */

4
Source/cmDependsFortranLexer.cxx
View File

@ -2165,7 +2165,7 @@ void cmDependsFortran_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscan
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param line_number The line number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner) void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
@ -2180,7 +2180,7 @@ void cmDependsFortran_yyset_lineno (int line_number , yyscan_t yyscanner)
} }
/** Set the current column. /** Set the current column.
* @param line_number * @param column_no The column number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmDependsFortran_yyset_column (int column_no , yyscan_t yyscanner) void cmDependsFortran_yyset_column (int column_no , yyscan_t yyscanner)

4
Source/cmDependsJavaLexer.cxx
View File

@ -2330,7 +2330,7 @@ void cmDependsJava_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param line_number The line number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmDependsJava_yyset_lineno (int line_number , yyscan_t yyscanner) void cmDependsJava_yyset_lineno (int line_number , yyscan_t yyscanner)
@ -2345,7 +2345,7 @@ void cmDependsJava_yyset_lineno (int line_number , yyscan_t yyscanner)
} }
/** Set the current column. /** Set the current column.
* @param column_no * @param column_no The column number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmDependsJava_yyset_column (int column_no , yyscan_t yyscanner) void cmDependsJava_yyset_column (int column_no , yyscan_t yyscanner)

13
Source/cmDocumentation.h
View File

@ -154,11 +154,11 @@ public:
/** /**
* Retrieve the list of documented module located in * Retrieve the list of documented module located in
* path which match the globing expression globExpr. * path which match the globing expression globExpr.
* @param[in] path, directory where to start the search * @param[in] path directory where to start the search
* we will recurse into it. * we will recurse into it.
* @param[in] globExpr, the globing expression used to * @param[in] globExpr the globing expression used to
* match the file in path. * match the file in path.
* @param[out] the list of obtained pairs (may be empty) * @param[out] docModuleList the list of obtained pairs (may be empty)
* @return 0 on success 1 on error or empty list * @return 0 on success 1 on error or empty list
*/ */
int getDocumentedModulesListInDir( int getDocumentedModulesListInDir(
@ -180,10 +180,9 @@ public:
* @param[in] fname the script file name to be parsed for documentation * @param[in] fname the script file name to be parsed for documentation
* @param[in,out] commands the vector of command/macros documentation * @param[in,out] commands the vector of command/macros documentation
* entry found in the script file. * entry found in the script file.
* @param[in,out] the cmake object instance to which variable documentation * @param[in,out] cm the cmake object instance to which variable
* will be attached (using @see cmake::DefineProperty) * documentation will be attached
* @param[in] the documentation section in which the property will be * (using @see cmake::DefineProperty)
* inserted.
* @return the number of documented items (command and variable) * @return the number of documented items (command and variable)
* found in the file. * found in the file.
*/ */

4
Source/cmExprLexer.cxx
View File

@ -1716,7 +1716,7 @@ void cmExpr_yyset_extra (YY_EXTRA_TYPE user_defined , yyscan_t yyscanner)
} }
/** Set the current line number. /** Set the current line number.
* @param line_number * @param line_number The line number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmExpr_yyset_lineno (int line_number , yyscan_t yyscanner) void cmExpr_yyset_lineno (int line_number , yyscan_t yyscanner)
@ -1731,7 +1731,7 @@ void cmExpr_yyset_lineno (int line_number , yyscan_t yyscanner)
} }
/** Set the current column. /** Set the current column.
* @param column_no * @param column_no The column number to set.
* @param yyscanner The scanner object. * @param yyscanner The scanner object.
*/ */
void cmExpr_yyset_column (int column_no , yyscan_t yyscanner) void cmExpr_yyset_column (int column_no , yyscan_t yyscanner)

4
Source/cmGraphVizWriter.cxx
View File

@ -534,8 +534,8 @@ int cmGraphVizWriter::CollectAllExternalLibs(int cnt)
ostr << this->GraphNodePrefix << cnt++; ostr << this->GraphNodePrefix << cnt++;
this->TargetNamesNodes[libName] = ostr.str(); this->TargetNamesNodes[libName] = ostr.str();
this->TargetPtrs[libName] = NULL; this->TargetPtrs[libName] = NULL;
//str << " \"" << ostr.c_str() << "\" [ label=\"" << libName // str << " \"" << ostr.c_str() << "\" [ label=\"" << libName
//<< "\" shape=\"ellipse\"];" << std::endl; // << "\" shape=\"ellipse\"];" << std::endl;
} }
} }
} }

4
Source/cmIncludeCommand.h
View File

@ -15,9 +15,7 @@
#include "cmCommand.h" #include "cmCommand.h"
/** \class cmIncludeCommand /** \class cmIncludeCommand
* \brief * \brief cmIncludeCommand defines a list of distant
*
* cmIncludeCommand defines a list of distant
* files that can be "included" in the current list file. * files that can be "included" in the current list file.
* In almost every sense, this is identical to a C/C++ * In almost every sense, this is identical to a C/C++
* #include command. Arguments are first expended as usual. * #include command. Arguments are first expended as usual.

2
Source/cmNewLineStyle.cxx
View File

@ -78,7 +78,7 @@ const std::string cmNewLineStyle::GetCharacters() const
return "\r\n"; return "\r\n";
default: default:
; ;
}; }
return ""; return "";
} }

6
Source/cmTarget.h
View File

@ -372,7 +372,7 @@ public:
/** Get the soname of the target. Allowed only for a shared library. */ /** Get the soname of the target. Allowed only for a shared library. */
std::string GetSOName(const char* config); std::string GetSOName(const char* config);
/** Whether this library has @rpath and platform supports it. */ /** Whether this library has \@rpath and platform supports it. */
bool HasMacOSXRpath(const char* config); bool HasMacOSXRpath(const char* config);
/** Test for special case of a third-party shared library that has /** Test for special case of a third-party shared library that has
@ -421,12 +421,12 @@ public:
bool IsChrpathUsed(const char* config); bool IsChrpathUsed(const char* config);
/** Return the install name directory for the target in the /** Return the install name directory for the target in the
* build tree. For example: "@rpath/", "@loader_path/", * build tree. For example: "\@rpath/", "\@loader_path/",
* or "/full/path/to/library". */ * or "/full/path/to/library". */
std::string GetInstallNameDirForBuildTree(const char* config); std::string GetInstallNameDirForBuildTree(const char* config);
/** Return the install name directory for the target in the /** Return the install name directory for the target in the
* install tree. For example: "@rpath/" or "@loader_path/". */ * install tree. For example: "\@rpath/" or "\@loader_path/". */
std::string GetInstallNameDirForInstallTree(); std::string GetInstallNameDirForInstallTree();
cmComputeLinkInformation* GetLinkInformation(const char* config, cmComputeLinkInformation* GetLinkInformation(const char* config,

2
Utilities/cmbzip2/compress.c
View File

@ -239,7 +239,7 @@ static
void sendMTFValues ( EState* s ) void sendMTFValues ( EState* s )
{ {
Int32 v, t, i, j, gs, ge, totc, bt, bc, iter; Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
Int32 nSelectors, alphaSize, minLen, maxLen, selCtr; Int32 nSelectors = 0, alphaSize, minLen, maxLen, selCtr;
Int32 nGroups, nBytes; Int32 nGroups, nBytes;
/*-- /*--

2
Utilities/cmcurl/multi.c
View File

@ -763,7 +763,7 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi,
struct Curl_message *msg = NULL; struct Curl_message *msg = NULL;
bool connected; bool connected;
bool async; bool async;
bool protocol_connect; bool protocol_connect = 0;
bool dophase_done; bool dophase_done;
bool done; bool done;
CURLMcode result = CURLM_OK; CURLMcode result = CURLM_OK;

2
Utilities/cmcurl/parsedate.h
View File

@ -1,5 +1,5 @@
#ifndef __PARSEDATE_H #ifndef __PARSEDATE_H
#define __PARSEDATEL_H #define __PARSEDATE_H
/*************************************************************************** /***************************************************************************
* _ _ ____ _ * _ _ ____ _
* Project ___| | | | _ \| | * Project ___| | | | _ \| |