Fix parameter name mismatch. (#3795)

cpp/src/phonenumbers/asyoutypeformatter.h

@@ -129,7 +129,7 @@ class AsYouTypeFormatter {
   // Check to see if there is an exact pattern match for these digits. If so, we
   // should use this instead of any other formatting template whose
   // leadingDigitsPattern also matches the input.
-  void AttemptToFormatAccruedDigits(string* formatted_number);
+  void AttemptToFormatAccruedDigits(string* formatted_result);
 
   // Combines the national number with any prefix (IDD/+ and country code or
   // national prefix) that was collected. A space will be inserted between them

cpp/src/phonenumbers/phonenumberutil.h

@@ -251,7 +251,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   // Gets the national significant number of a phone number. Note a national
   // significant number doesn't contain a national prefix or any formatting.
   void GetNationalSignificantNumber(const PhoneNumber& number,
-                                    string* national_significant_num) const;
+                                    string* national_number) const;
 
   // Gets the length of the geographical area code from the PhoneNumber object
   // passed in, so that clients could use it to split a national significant
@@ -930,7 +930,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
       const PhoneNumber& number,
       const PhoneMetadata& metadata,
       PhoneNumberFormat number_format,
-      string* extension) const;
+      string* formatted_number) const;
 
   void GetRegionCodeForNumberFromRegionList(
       const PhoneNumber& number,
@@ -962,7 +962,7 @@ class PhoneNumberUtil : public Singleton<PhoneNumberUtil> {
   int ExtractCountryCode(string* national_number) const;
   ErrorType MaybeExtractCountryCode(
       const PhoneMetadata* default_region_metadata,
-      bool keepRawInput,
+      bool keep_raw_input,
       string* national_number,
       PhoneNumber* phone_number) const;