Bug 1448755 - Use AssignLiteral and AssignASCII for short zero-terminated strings in networking. r?jduell.
MozReview-Commit-ID: HPzng5p6qkb
--- a/netwerk/base/Dashboard.cpp
+++ b/netwerk/base/Dashboard.cpp
@@ -763,19 +763,19 @@ Dashboard::GetDNSCacheEntries(DnsData *d
if (!addr) {
JS_ReportOutOfMemory(cx);
return NS_ERROR_OUT_OF_MEMORY;
}
CopyASCIItoUTF16(dnsData->mData[i].hostaddr[j], *addr);
}
if (dnsData->mData[i].family == PR_AF_INET6) {
- CopyASCIItoUTF16("ipv6", entry.mFamily);
+ entry.mFamily.AssignLiteral(u"ipv6");
} else {
- CopyASCIItoUTF16("ipv4", entry.mFamily);
+ entry.mFamily.AssignLiteral(u"ipv4");
}
}
JS::RootedValue val(cx);
if (!ToJSValue(cx, dict, &val)) {
return NS_ERROR_FAILURE;
}
dnsData->mCallback->OnDashboardDataAvailable(val);
--- a/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
+++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp
@@ -743,21 +743,21 @@ mozTXTToHTMLConv::SmilyHit(const char16_
{
if (!col0)
{
outputHTML.Truncate();
outputHTML.Append(char16_t(' '));
}
outputHTML.AppendLiteral("<span class=\""); // <span class="
- AppendASCIItoUTF16(imageName, outputHTML); // e.g. smiley-frown
+ outputHTML.AppendASCII(imageName); // e.g. smiley-frown
outputHTML.AppendLiteral("\" title=\""); // " title="
- AppendASCIItoUTF16(tagTXT, outputHTML); // smiley tooltip
+ outputHTML.AppendASCII(tagTXT); // smiley tooltip
outputHTML.AppendLiteral("\"><span>"); // "><span>
- AppendASCIItoUTF16(tagTXT, outputHTML); // original text
+ outputHTML.AppendASCII(tagTXT); // original text
outputHTML.AppendLiteral("</span></span>"); // </span></span>
glyphTextLen = (col0 ? 0 : 1) + tagLen;
return true;
}
return false;
}
--- a/netwerk/wifi/nsWifiAccessPoint.cpp
+++ b/netwerk/wifi/nsWifiAccessPoint.cpp
@@ -30,17 +30,17 @@ NS_IMETHODIMP nsWifiAccessPoint::GetMac(
aMac.Assign(mMac);
return NS_OK;
}
NS_IMETHODIMP nsWifiAccessPoint::GetSsid(nsAString& aSsid)
{
// just assign and embedded nulls will truncate resulting
// in a displayable string.
- CopyASCIItoUTF16(mSsid, aSsid);
+ aSsid.AssignASCII(mSsid);
return NS_OK;
}
NS_IMETHODIMP nsWifiAccessPoint::GetRawSSID(nsACString& aRawSsid)
{
aRawSsid.Assign(mSsid, mSsidLen); // SSIDs are 32 chars long
return NS_OK;