tandem
/
pg-libphonenumber
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

clean up error handling slightly

This commit is contained in:
Ben Merritt 2018-06-16 15:11:44 -07:00
parent b22c086e10
commit 3ca4cdb37a
No known key found for this signature in database
GPG Key ID: F8AD20ED4E6239B7
1 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/error_handling.cpp
View File

@ -13,24 +13,26 @@ extern "C" {
using namespace i18n::phonenumbers;
static const char* parseErrorMessage(PhoneNumberUtil::ErrorType error) {
using PNU = i18n::phonenumbers::PhoneNumberUtil;
switch(error) {
case PNU::NO_PARSING_ERROR:
return "Parsed successfully";
case PNU::INVALID_COUNTRY_CODE_ERROR:
return "Invalid country code";
case PNU::NOT_A_NUMBER:
return "String does not appear to contain a phone number";
case PNU::TOO_SHORT_AFTER_IDD:
return "Too short after IDD";
case PNU::TOO_SHORT_NSN:
return "National number is too short";
case PNU::TOO_LONG_NSN:
return "National number is too long";
default:
//We have some generic parsing error.
return "Unable to parse number";
namespace {
const char* getParseErrorMessage(PhoneNumberUtil::ErrorType error) {
using PNU = i18n::phonenumbers::PhoneNumberUtil;
switch(error) {
case PNU::NO_PARSING_ERROR:
return "Parsed successfully";
case PNU::INVALID_COUNTRY_CODE_ERROR:
return "Invalid country code";
case PNU::NOT_A_NUMBER:
return "String does not appear to contain a phone number";
case PNU::TOO_SHORT_AFTER_IDD:
return "Too short after IDD";
case PNU::TOO_SHORT_NSN:
return "National number is too short";
case PNU::TOO_LONG_NSN:
return "National number is too long";
default:
//We have some generic parsing error.
return "Unable to parse number";
}
}
}
@ -51,23 +53,22 @@ void reportOutOfMemory() {
* depending on the type of the exception
*/
void reportException(const std::exception& exception) {
{
const std::bad_alloc* bad_alloc = dynamic_cast<const std::bad_alloc*>(&exception);
if(bad_alloc != nullptr) {
reportOutOfMemory();
return;
}
const PhoneNumberTooLongException* too_long =
dynamic_cast<const PhoneNumberTooLongException*>(&exception);
if(too_long != nullptr) {
std::string phone_number = too_long->number_string();
phone_number += '\0';
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("phone number '%s' is too long", phone_number.data()),
errdetail("%s", exception.what())));
return;
}
const std::bad_alloc* bad_alloc = dynamic_cast<const std::bad_alloc*>(&exception);
if(bad_alloc != nullptr) {
reportOutOfMemory();
return;
}
const PhoneNumberTooLongException* too_long =
dynamic_cast<const PhoneNumberTooLongException*>(&exception);
if(too_long != nullptr) {
std::string phone_number = too_long->number_string();
phone_number += '\0';
ereport(ERROR,
(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
errmsg("phone number '%s' is too long", phone_number.data()),
errdetail("%s", exception.what())));
return;
}
//If we don't have a special way to handle this exception, report
@ -82,7 +83,7 @@ void reportParseError(const char* phone_number, PhoneNumberUtil::ErrorType err)
ereport(ERROR,
(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
errmsg("unable to parse '%s' as a phone number", phone_number),
errdetail("%s", parseErrorMessage(err))));
errdetail("%s", getParseErrorMessage(err))));
}
void logInfo(const char* msg) {