diff options
author | Ryan Johnson <ryan@iambismark.net> | 2013-07-11 18:45:04 -0500 |
---|---|---|
committer | Ryan Johnson <ryan@iambismark.net> | 2013-07-11 18:45:04 -0500 |
commit | 6594f1527f9392ed74201d726b0c6aa6897e372b (patch) | |
tree | 06ca5c249d8888508f15a4b08f7bd3efc95bc8a4 /src/core | |
parent | 31762d8a7434268f08ae7dfbf06edc95754efb25 (diff) |
Adds NULL check and style cleanup
* Adds check for mExtraHeaders == NULL to all allExtraHeadersNames()
* Makes mExtraHeaders == NULL checks more consistent
* Cleans up code formatting to be more consistent
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/abstract/MCMessageHeader.cc | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc index 2a3552fa..bdeb6907 100644 --- a/src/core/abstract/MCMessageHeader.cc +++ b/src/core/abstract/MCMessageHeader.cc @@ -295,32 +295,37 @@ String * MessageHeader::userAgent() return mUserAgent; } -void MessageHeader::setExtraHeaders(HashMap * headers) { +void MessageHeader::setExtraHeaders(HashMap * headers) +{ MC_SAFE_REPLACE_COPY(HashMap, mExtraHeaders, headers); } -Array * MessageHeader::allExtraHeadersNames() { +Array * MessageHeader::allExtraHeadersNames() +{ + if (mExtraHeaders == NULL) + return Array::array(); return mExtraHeaders->allKeys(); } -void MessageHeader::addHeader(String * name, String * object) { - if (mExtraHeaders == NULL) { +void MessageHeader::addHeader(String * name, String * object) +{ + if (mExtraHeaders == NULL) mExtraHeaders = new HashMap(); - } mExtraHeaders->setObjectForKey(name, object); } -void MessageHeader::removeHeader(String * name) { - if (mExtraHeaders != NULL) { - mExtraHeaders->removeObjectForKey(name); - } +void MessageHeader::removeHeader(String * name) +{ + if (mExtraHeaders == NULL) + return; + mExtraHeaders->removeObjectForKey(name); } -String * MessageHeader::headerValueForName(String * name) { - if (mExtraHeaders) { - return (String *) mExtraHeaders->objectForKey(name); - } - return NULL; +String * MessageHeader::headerValueForName(String * name) +{ + if (mExtraHeaders == NULL) + return NULL; + return (String *) mExtraHeaders->objectForKey(name); } String * MessageHeader::extractedSubject() |