Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

small changes to clients of string converting routines

Browse Source
This commit is contained in:
scc%netscape.com 2000-03-26 13:32:12 +00:00
parent 898f9bb454
commit b6d6427bb1
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/imap/src/nsImapIncomingServer.cpp
View File

@ -629,7 +629,7 @@ NS_IMETHODIMP nsImapIncomingServer::PossibleImapMailbox(const char *folderPath,
GetServerURI(getter_Copies(serverUri)); GetServerURI(getter_Copies(serverUri));
uri = serverUri; uri.Assign(serverUri);
PRInt32 leafPos = folderName.RFindChar('/'); PRInt32 leafPos = folderName.RFindChar('/');

12
mailnews/imap/src/nsImapMailFolder.cpp
View File

@ -353,13 +353,13 @@ nsresult nsImapMailFolder::CreateSubFolders(nsFileSpec &path)
// take the full unicode folder name and find the unicode leaf name. // take the full unicode folder name and find the unicode leaf name.
currentFolderNameStr = unicodeName; currentFolderNameStr.Assign(unicodeName);
PRInt32 leafPos = currentFolderNameStr.RFindChar('/'); PRInt32 leafPos = currentFolderNameStr.RFindChar('/');
if (leafPos > 0) if (leafPos > 0)
currentFolderNameStr.Cut(0, leafPos + 1); currentFolderNameStr.Cut(0, leafPos + 1);
// take the utf7 full online name, and determine the utf7 leaf name // take the utf7 full online name, and determine the utf7 leaf name
utf7LeafName = onlineFullUtf7Name; utf7LeafName.Assign(onlineFullUtf7Name);
leafPos = utf7LeafName.RFindChar('/'); leafPos = utf7LeafName.RFindChar('/');
if (leafPos > 0) if (leafPos > 0)
utf7LeafName.Cut(0, leafPos + 1); utf7LeafName.Cut(0, leafPos + 1);
@ -658,7 +658,7 @@ NS_IMETHODIMP nsImapMailFolder::CreateClientSubfolderInfo(const char *folderName
nsCAutoString onlineName = m_onlineFolderName; nsCAutoString onlineName = m_onlineFolderName;
if (onlineName.Length() > 0) if (onlineName.Length() > 0)
onlineName += hierarchyDelimiter; onlineName += hierarchyDelimiter;
onlineName += folderNameStr; onlineName.Append(folderNameStr);
imapFolder->SetVerifiedAsOnlineFolder(PR_TRUE); imapFolder->SetVerifiedAsOnlineFolder(PR_TRUE);
imapFolder->SetOnlineName(onlineName.GetBuffer()); imapFolder->SetOnlineName(onlineName.GetBuffer());
imapFolder->SetHierarchyDelimiter(hierarchyDelimiter); imapFolder->SetHierarchyDelimiter(hierarchyDelimiter);
@ -1155,7 +1155,7 @@ NS_IMETHODIMP nsImapMailFolder::ReadFromFolderCacheElem(nsIMsgFolderCacheElement
m_hierarchyDelimiter = (PRUnichar) hierarchyDelimiter; m_hierarchyDelimiter = (PRUnichar) hierarchyDelimiter;
rv = element->GetStringProperty("onlineName", getter_Copies(onlineName)); rv = element->GetStringProperty("onlineName", getter_Copies(onlineName));
if (NS_SUCCEEDED(rv) && (const char *) onlineName && nsCRT::strlen((const char *) onlineName)) if (NS_SUCCEEDED(rv) && (const char *) onlineName && nsCRT::strlen((const char *) onlineName))
m_onlineFolderName = onlineName; m_onlineFolderName.Assign(onlineName);
return rv; return rv;
} }
@ -1263,7 +1263,7 @@ nsImapMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatab
if (NS_SUCCEEDED((*folderInfo)->GetCharPtrProperty("onlineName", getter_Copies(onlineName)))) if (NS_SUCCEEDED((*folderInfo)->GetCharPtrProperty("onlineName", getter_Copies(onlineName))))
{ {
if ((const char*) onlineName && nsCRT::strlen((const char *) onlineName) > 0) if ((const char*) onlineName && nsCRT::strlen((const char *) onlineName) > 0)
m_onlineFolderName = onlineName; m_onlineFolderName.Assign(onlineName);
else else
{ {
char *uri = nsnull; char *uri = nsnull;
@ -1274,7 +1274,7 @@ nsImapMailFolder::GetDBFolderInfoAndDB(nsIDBFolderInfo **folderInfo, nsIMsgDatab
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
nsXPIDLCString name; nsXPIDLCString name;
rv = nsImapURI2FullName(kImapRootURI, hostname, uri, getter_Copies(name)); rv = nsImapURI2FullName(kImapRootURI, hostname, uri, getter_Copies(name));
m_onlineFolderName = name; m_onlineFolderName.Assign(name);
nsAutoString autoOnlineName(name); nsAutoString autoOnlineName(name);
rv = (*folderInfo)->SetProperty("onlineName", &autoOnlineName); rv = (*folderInfo)->SetProperty("onlineName", &autoOnlineName);
PR_FREEIF(uri); PR_FREEIF(uri);

2
mailnews/imap/src/nsImapProtocol.cpp
View File

@ -2932,7 +2932,7 @@ void nsImapProtocol::ProcessMailboxUpdate(PRBool handlePossibleUndo)
nsCAutoString undoIds; nsCAutoString undoIds;
GetCurrentUrl()->CreateListOfMessageIdsString(getter_Copies(undoIdsStr)); GetCurrentUrl()->CreateListOfMessageIdsString(getter_Copies(undoIdsStr));
undoIds = undoIdsStr; undoIds.Assign(undoIdsStr);
if (undoIds.Length() > 0) if (undoIds.Length() > 0)
{ {
char firstChar = (char) undoIds.CharAt(0); char firstChar = (char) undoIds.CharAt(0);

4
mailnews/imap/src/nsImapService.cpp
View File

@ -268,7 +268,7 @@ NS_IMETHODIMP nsImapService::GetUrlForUri(const char *aMessageURI, nsIURI **aURL
nsCOMPtr<nsIURI> url = do_QueryInterface(imapUrl); nsCOMPtr<nsIURI> url = do_QueryInterface(imapUrl);
nsXPIDLCString currentSpec; nsXPIDLCString currentSpec;
url->GetSpec(getter_Copies(currentSpec)); url->GetSpec(getter_Copies(currentSpec));
urlSpec = currentSpec; urlSpec.Assign(currentSpec);
urlSpec.Append("fetch>"); urlSpec.Append("fetch>");
urlSpec.Append(uidString); urlSpec.Append(uidString);
@ -561,7 +561,7 @@ nsImapService::FetchMessage(nsIImapUrl * aImapUrl,
nsXPIDLCString currentSpec; nsXPIDLCString currentSpec;
nsCOMPtr<nsIURI> url = do_QueryInterface(aImapUrl); nsCOMPtr<nsIURI> url = do_QueryInterface(aImapUrl);
url->GetSpec(getter_Copies(currentSpec)); url->GetSpec(getter_Copies(currentSpec));
urlSpec = currentSpec; urlSpec.Assign(currentSpec);
PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder); PRUnichar hierarchySeparator = GetHierarchyDelimiter(aImapMailFolder);

2
mailnews/imap/src/nsImapUrl.cpp
View File

@ -998,7 +998,7 @@ nsImapUrl::GetURI(char** aURI)
fullFolderPath += '@'; fullFolderPath += '@';
fullFolderPath += hostName; fullFolderPath += hostName;
fullFolderPath += '/'; fullFolderPath += '/';
fullFolderPath += theFile; fullFolderPath.Append(theFile);
PR_FREEIF(hostName); PR_FREEIF(hostName);
char * baseMessageURI; char * baseMessageURI;

4
mailnews/imap/src/nsImapUtils.cpp
View File

@ -143,7 +143,7 @@ nsImapURI2Path(const char* rootURI, const char* uriStr, nsFileSpec& pathResult)
parentName.Right(leafName, parentName.Length() - dirEnd -1); parentName.Right(leafName, parentName.Length() - dirEnd -1);
parentName.Truncate(dirEnd); parentName.Truncate(dirEnd);
NS_MsgHashIfNecessary(parentName); NS_MsgHashIfNecessary(parentName);
parentName += sbdSep; parentName.Append(sbdSep);
pathResult += (const char *) parentName; pathResult += (const char *) parentName;
// this fixes a strange purify warning. // this fixes a strange purify warning.
parentName = (const char *) leafName; parentName = (const char *) leafName;
@ -172,7 +172,7 @@ nsImapURI2FullName(const char* rootURI, const char* hostname, char* uriStr,
PRInt32 hostEnd = uri.FindChar('/'); PRInt32 hostEnd = uri.FindChar('/');
if (hostEnd <= 0) return NS_ERROR_FAILURE; if (hostEnd <= 0) return NS_ERROR_FAILURE;
uri.Right(fullName, uri.Length() - hostEnd - 1); uri.Right(fullName, uri.Length() - hostEnd - 1);
if (fullName == "") return NS_ERROR_FAILURE; if (fullName.IsEmpty()) return NS_ERROR_FAILURE;
*name = fullName.ToNewCString(); *name = fullName.ToNewCString();
return NS_OK; return NS_OK;
} }