Fix Cppcheck warnings about mismatching argument names

Author: danmar

lib/checkio.h

@@ -110,7 +110,7 @@ class CPPCHECKLIB CheckIO : public Check {
     void seekOnAppendedFileError(const Token *tok);
     void invalidScanfError(const Token *tok);
     void wrongPrintfScanfArgumentsError(const Token* tok,
-                                        const std::string &function,
+                                        const std::string &functionName,
                                         unsigned int numFormat,
                                         unsigned int numFunction);
     void wrongPrintfScanfPosixParameterPositionError(const Token* tok, const std::string& functionName,
@@ -127,7 +127,7 @@ class CPPCHECKLIB CheckIO : public Check {
     void invalidPrintfArgTypeError_float(const Token* tok, unsigned int numFormat, const std::string& specifier, const ArgumentInfo* argInfo);
     void invalidLengthModifierError(const Token* tok, unsigned int numFormat, const std::string& modifier);
     void invalidScanfFormatWidthError(const Token* tok, unsigned int numFormat, int width, const Variable *var, char c);
-    static void argumentType(std::ostream & s, const ArgumentInfo * argInfo);
+    static void argumentType(std::ostream & os, const ArgumentInfo * argInfo);
     static Severity::SeverityType getSeverity(const ArgumentInfo *argInfo);
 
     void getErrorMessages(ErrorLogger *errorLogger, const Settings *settings) const {

lib/checkmemoryleak.h

@@ -69,13 +69,13 @@ class CPPCHECKLIB CheckMemoryLeak {
 
     /**
      * Report error. Similar with the function Check::reportError
-     * @param location the token where the error occurs
+     * @param tok the token where the error occurs
      * @param severity the severity of the bug
      * @param id type of message
      * @param msg text
      * @param cwe cwe number
      */
-    void reportErr(const Token *location, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
+    void reportErr(const Token *tok, Severity::SeverityType severity, const std::string &id, const std::string &msg, const CWE &cwe) const;
 
     /**
      * Report error. Similar with the function Check::reportError

lib/checknullpointer.h

@@ -85,7 +85,7 @@ class CPPCHECKLIB CheckNullPointer : public Check {
 
     void nullPointerError(const Token *tok);  // variable name unknown / doesn't exist
     void nullPointerError(const Token *tok, const std::string &varname, bool inconclusive, bool defaultArg, bool possible);
-    void nullPointerError(const Token *tok, const std::string &varname, const Token* nullcheck, bool inconclusive);
+    void nullPointerError(const Token *tok, const std::string &varname, const Token* nullCheck, bool inconclusive);
 private:
 
     /** Get error messages. Used by --errorlist */