Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug 227497. Cleaning up some string usage in nsLDAPChannel. r+sr=peterv@propagandism.org

Browse Source
This commit is contained in:
jst%mozilla.jstenback.com 2004-04-13 03:53:38 +00:00
parent 3b9482b945
commit 592c7e8211
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
directory/xpcom/base/src/nsLDAPChannel.cpp
View File

@ -897,7 +897,7 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
{ {
nsresult rv; nsresult rv;
nsCAutoString dn; nsCAutoString dn;
nsString entry; nsCString entry;
PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, ("entry returned!\n")); PR_LOG(gLDAPLogModule, PR_LOG_DEBUG, ("entry returned!\n"));
@ -908,8 +908,7 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
entry.SetCapacity(256); entry.SetCapacity(256);
entry = NS_LITERAL_STRING("dn: ") + NS_ConvertUTF8toUCS2(dn) entry = NS_LITERAL_CSTRING("dn: ") + dn + NS_LITERAL_CSTRING("\n");
+ NS_LITERAL_STRING("\n");
char **attrs; char **attrs;
PRUint32 attrCount; PRUint32 attrCount;
@ -947,10 +946,10 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
// print all values of this attribute // print all values of this attribute
// //
for ( PRUint32 j=0 ; j < valueCount; j++ ) { for ( PRUint32 j=0 ; j < valueCount; j++ ) {
AppendASCIItoUTF16(attrs[i], entry); entry.Append(attrs[i]);
entry.Append(NS_LITERAL_STRING(": ")); entry.Append(": ");
entry.Append(vals[j]); AppendUTF16toUTF8(vals[j], entry);
entry.Append(NS_LITERAL_STRING("\n")); entry.Append('\n');
} }
NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(valueCount, vals); NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(valueCount, vals);
@ -967,7 +966,7 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
// separate this entry from the next // separate this entry from the next
// //
entry.Append(NS_LITERAL_STRING("\n")); entry.Append('\n');
// do the write // do the write
// XXX better err handling // XXX better err handling
@ -975,8 +974,7 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAPMessage *aMessage)
PRUint32 bytesWritten = 0; PRUint32 bytesWritten = 0;
PRUint32 entryLength = entry.Length(); PRUint32 entryLength = entry.Length();
rv = mReadPipeOut->Write(NS_ConvertUCS2toUTF8(entry).get(), rv = mReadPipeOut->Write(entry.get(), entryLength, &bytesWritten);
entryLength, &bytesWritten);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// short writes shouldn't happen on blocking pipes! // short writes shouldn't happen on blocking pipes!