Bug 1421541 - Tweak GetCStringValue(). r=glandium
It's not possible for a string value to be nullptr.
MozReview-Commit-ID: 13X28YObvwp
--- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp
@@ -396,32 +396,28 @@ public:
}
nsresult GetCStringValue(PrefValueKind aKind, nsACString& aResult)
{
if (!IsTypeString()) {
return NS_ERROR_UNEXPECTED;
}
- const char* stringVal = nullptr;
if (aKind == PrefValueKind::Default || IsLocked() || !mHasUserValue) {
// Do we have a default?
if (!mHasDefaultValue) {
return NS_ERROR_UNEXPECTED;
}
- stringVal = mDefaultValue.mStringVal;
+ MOZ_ASSERT(mDefaultValue.mStringVal);
+ aResult = mDefaultValue.mStringVal;
} else {
- stringVal = mUserValue.mStringVal;
+ MOZ_ASSERT(mUserValue.mStringVal);
+ aResult = mUserValue.mStringVal;
}
- if (!stringVal) {
- return NS_ERROR_UNEXPECTED;
- }
-
- aResult = stringVal;
return NS_OK;
}
void ToDomPref(dom::Pref* aDomPref)
{
aDomPref->name() = mName;
aDomPref->isLocked() = mIsLocked;