From 2bfaed0498d7e94d62e1db16ec34faa5d71fa270 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Fri, 2 Nov 2001 06:39:49 +0000 Subject: [PATCH] Bug 53057: Fixing up users of implicit |CharT*| conversion operators for nsCString to use |.get()| instead, rr=dbaron, rs=scc git-svn-id: svn://10.0.0.236/trunk@107078 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp | 2 +- .../import/eudora/src/nsEudoraMac.cpp | 52 +++++++++---------- mozilla/netwerk/mime/src/nsMIMEService.cpp | 4 +- .../pref-migrator/src/nsPrefMigration.cpp | 2 +- .../mac/nsInternetConfigService.cpp | 8 +-- .../exthandler/mac/nsMacMIMEDataSource.cpp | 6 +-- .../exthandler/nsExternalHelperAppService.cpp | 4 +- mozilla/widget/src/mac/nsDragService.cpp | 6 +-- mozilla/xpcom/io/nsLocalFileMac.cpp | 22 ++++---- .../appshell/src/nsInternetConfigService.cpp | 8 +-- .../xpfe/appshell/src/nsMacMIMEDataSource.cpp | 6 +-- 11 files changed, 60 insertions(+), 60 deletions(-) diff --git a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp index 5a2409aa9fa..85597e6f448 100644 --- a/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp +++ b/mozilla/gfx/src/mac/nsUnicodeMappingUtil.cpp @@ -306,7 +306,7 @@ nsUnicodeMappingUtil::PrefEnumCallback(const char* aName, void* aClosure) curPrefName.Mid(langGroup, p1+1, curPrefName.Length()-p1-1); curPrefName.Mid(genName, p2+1, p1-p2-1); - ScriptCode script = Self->MapLangGroupToScriptCode(langGroup); + ScriptCode script = Self->MapLangGroupToScriptCode(langGroup.get()); if(script >= (smPseudoTotalScripts)) { // Because of the pseudo-scripts of Unicode and User-Defined, we have to handle diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp index 54f2f5a7343..6996b7f0ac7 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraMac.cpp @@ -272,7 +272,7 @@ nsresult nsEudoraMac::IterateMailDir( nsIFileSpec *pFolder, nsISupportsArray *pA nsCRT::free( pName); if (isFolder) { if (IsValidMailFolderName( fName)) { - rv = FoundMailFolder( entry, fName, pArray, pImport); + rv = FoundMailFolder( entry, fName.get(), pArray, pImport); if (NS_SUCCEEDED( rv)) { rv = ScanMailDir( entry, pArray, pImport); if (NS_FAILED( rv)) { @@ -288,7 +288,7 @@ nsresult nsEudoraMac::IterateMailDir( nsIFileSpec *pFolder, nsISupportsArray *pA creator = 0; spec.GetFileTypeAndCreator( &type, &creator); if ((type == 'TEXT') && IsValidMailboxName( fName) && IsValidMailboxFile( entry)) { - rv = FoundMailbox( entry, fName, pArray, pImport); + rv = FoundMailbox( entry, fName.get(), pArray, pImport); } } } @@ -460,7 +460,7 @@ nsresult nsEudoraMac::FindTOCFile( nsIFileSpec *pMailFile, nsIFileSpec **ppTOCFi OSType creator = 0; PRBool exists = PR_FALSE; PRBool isFile = PR_FALSE; - rv = (*ppTOCFile)->AppendRelativeUnixPath( leaf); + rv = (*ppTOCFile)->AppendRelativeUnixPath( leaf.get()); if (NS_SUCCEEDED( rv)) rv = (*ppTOCFile)->Exists( &exists); if (NS_SUCCEEDED( rv) && exists) @@ -702,16 +702,16 @@ PRBool nsEudoraMac::BuildPOPAccount( nsIMsgAccountManager *accMgr, nsCString **p // I now have a user name/server name pair, find out if it already exists? nsCOMPtr in; - nsresult rv = accMgr->FindServer( *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), "pop3", getter_AddRefs( in)); + nsresult rv = accMgr->FindServer( pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), "pop3", getter_AddRefs( in)); if (NS_FAILED( rv) || (in == nsnull)) { // Create the incoming server and an account for it? - rv = accMgr->CreateIncomingServer( *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), "pop3", getter_AddRefs( in)); + rv = accMgr->CreateIncomingServer( pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), "pop3", getter_AddRefs( in)); if (NS_SUCCEEDED( rv) && in) { rv = in->SetType( "pop3"); - // rv = in->SetHostName( *(pStrs[kPopServerStr])); - // rv = in->SetUsername( *(pStrs[kPopAccountNameStr])); + // rv = in->SetHostName( pStrs[kPopServerStr]->get()); + // rv = in->SetUsername( pStrs[kPopAccountNameStr]->get()); - IMPORT_LOG2( "Created POP3 server named: %s, userName: %s\n", (const char *)(*(pStrs[kPopServerStr])), (const char *)(*(pStrs[kPopAccountNameStr]))); + IMPORT_LOG2( "Created POP3 server named: %s, userName: %s\n", pStrs[kPopServerStr]->get(), pStrs[kPopAccountNameStr]->get()); PRUnichar *pretty = ToNewUnicode(accName); IMPORT_LOG1( "\tSet pretty name to: %S\n", pretty); @@ -728,10 +728,10 @@ PRBool nsEudoraMac::BuildPOPAccount( nsIMsgAccountManager *accMgr, nsCString **p nsCOMPtr pop3Server = do_QueryInterface(in, &rv); NS_ENSURE_SUCCESS(rv,rv); - pop3Server->SetLeaveMessagesOnServer(*pStrs[kLeaveOnServerStr][0] == 'Y' ? PR_TRUE : PR_FALSE); + pop3Server->SetLeaveMessagesOnServer(pStrs[kLeaveOnServerStr]->First() == 'Y' ? PR_TRUE : PR_FALSE); // Fiddle with the identities - SetIdentities(accMgr, account, *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), pStrs); + SetIdentities(accMgr, account, pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), pStrs); result = PR_TRUE; if (ppAccount) account->QueryInterface( NS_GET_IID(nsIMsgAccount), (void **)ppAccount); @@ -754,16 +754,16 @@ PRBool nsEudoraMac::BuildIMAPAccount( nsIMsgAccountManager *accMgr, nsCString ** PRBool result = PR_FALSE; nsCOMPtr in; - nsresult rv = accMgr->FindServer( *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), "imap", getter_AddRefs( in)); + nsresult rv = accMgr->FindServer( pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), "imap", getter_AddRefs( in)); if (NS_FAILED( rv) || (in == nsnull)) { // Create the incoming server and an account for it? - rv = accMgr->CreateIncomingServer( *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), "imap", getter_AddRefs( in)); + rv = accMgr->CreateIncomingServer( pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), "imap", getter_AddRefs( in)); if (NS_SUCCEEDED( rv) && in) { rv = in->SetType( "imap"); - // rv = in->SetHostName( *(pStrs[kPopServerStr])); - // rv = in->SetUsername( *(pStrs[kPopAccountNameStr])); + // rv = in->SetHostName( pStrs[kPopServerStr]->get()); + // rv = in->SetUsername( pStrs[kPopAccountNameStr]->get()); - IMPORT_LOG2( "Created IMAP server named: %s, userName: %s\n", (const char *)(*(pStrs[kPopServerStr])), (const char *)(*(pStrs[kPopAccountNameStr]))); + IMPORT_LOG2( "Created IMAP server named: %s, userName: %s\n", pStrs[kPopServerStr]->get(), pStrs[kPopAccountNameStr]->get()); PRUnichar *pretty = ToNewUnicode(accName); @@ -781,7 +781,7 @@ PRBool nsEudoraMac::BuildIMAPAccount( nsIMsgAccountManager *accMgr, nsCString ** IMPORT_LOG0( "Created an account and set the IMAP server as the incoming server\n"); // Fiddle with the identities - SetIdentities(accMgr, account, *(pStrs[kPopAccountNameStr]), *(pStrs[kPopServerStr]), pStrs); + SetIdentities(accMgr, account, pStrs[kPopAccountNameStr]->get(), pStrs[kPopServerStr]->get(), pStrs); result = PR_TRUE; if (ppAccount) account->QueryInterface( NS_GET_IID(nsIMsgAccount), (void **)ppAccount); @@ -804,12 +804,12 @@ void nsEudoraMac::SetIdentities(nsIMsgAccountManager *accMgr, nsIMsgAccount *acc if (id) { nsAutoString fullName; if (pStrs[kFullNameStr]->Length()) { - fullName.AssignWithConversion(*(pStrs[kFullNameStr])); + fullName.AssignWithConversion(pStrs[kFullNameStr]->get()); } id->SetFullName( fullName.get()); id->SetIdentityName( fullName.get()); if (pStrs[kReturnAddressStr]->Length()) { - id->SetEmail( *(pStrs[kReturnAddressStr])); + id->SetEmail( pStrs[kReturnAddressStr]->get()); } else { nsCAutoString emailAddress; @@ -821,11 +821,11 @@ void nsEudoraMac::SetIdentities(nsIMsgAccountManager *accMgr, nsIMsgAccount *acc acc->AddIdentity( id); IMPORT_LOG0( "Created identity and added to the account\n"); - IMPORT_LOG1( "\tname: %s\n", (const char *)(*(pStrs[kFullNameStr]))); - IMPORT_LOG1( "\temail: %s\n", (const char *)(*(pStrs[kReturnAddressStr]))); + IMPORT_LOG1( "\tname: %s\n", pStrs[kFullNameStr]->get()); + IMPORT_LOG1( "\temail: %s\n", pStrs[kReturnAddressStr]->get()); } - SetSmtpServer( accMgr, acc, *(pStrs[kSmtpServerStr]), nsnull); + SetSmtpServer( accMgr, acc, pStrs[kSmtpServerStr]->get(), nsnull); } @@ -922,8 +922,8 @@ nsresult nsEudoraMac::GetAttachmentInfo( const char *pFileName, nsIFileSpec *pSp creatStr.Append( (const char *)&creator, 4); typeStr.Append( (const char *)&type, 4); - IMPORT_LOG3( "\tAttachment type: %s, creator: %s, fileNum: %ld\n", (const char *)typeStr, (const char *)creatStr, fNum); - IMPORT_LOG1( "\tAttachment file name: %s\n", (const char *)str); + IMPORT_LOG3( "\tAttachment type: %s, creator: %s, fileNum: %ld\n", typeStr.get(), creatStr.get(), fNum); + IMPORT_LOG1( "\tAttachment file name: %s\n", str.get()); #endif // Now we have all of the pertinent info, find out if the file exists? @@ -948,11 +948,11 @@ nsresult nsEudoraMac::GetAttachmentInfo( const char *pFileName, nsIFileSpec *pSp Str63 str63; short vRefNum = 0; if (volumeName.Length() > 63) { - nsCRT::memcpy( &(str63[1]), (const char *)volumeName, 63); + nsCRT::memcpy( &(str63[1]), volumeName.get(), 63); str63[0] = 63; } else { - nsCRT::memcpy( &(str63[1]), (const char *)volumeName, volumeName.Length()); + nsCRT::memcpy( &(str63[1]), volumeName.get(), volumeName.Length()); str63[0] = volumeName.Length(); } @@ -995,7 +995,7 @@ nsresult nsEudoraMac::GetAttachmentInfo( const char *pFileName, nsIFileSpec *pSp else mimeType = "application/octet-stream"; - IMPORT_LOG1( "\tMimeType: %s\n", (const char *)mimeType); + IMPORT_LOG1( "\tMimeType: %s\n", mimeType.get()); return( NS_OK); } diff --git a/mozilla/netwerk/mime/src/nsMIMEService.cpp b/mozilla/netwerk/mime/src/nsMIMEService.cpp index a6c2ac49b67..c8931467bc0 100644 --- a/mozilla/netwerk/mime/src/nsMIMEService.cpp +++ b/mozilla/netwerk/mime/src/nsMIMEService.cpp @@ -213,10 +213,10 @@ NS_IMETHODIMP nsMIMEService::GetTypeFromFile( nsIFile* aFile, char **aContentTyp { PRUint32 type, creator; macFile->GetFileTypeAndCreator( (OSType*)&type,(OSType*) &creator ); - if( !mXML || NS_FAILED (rv = mXML->GetFromTypeCreator( type, creator, fileExt, getter_AddRefs(info) ) ) ) + if( !mXML || NS_FAILED (rv = mXML->GetFromTypeCreator( type, creator, fileExt.get(), getter_AddRefs(info) ) ) ) { if ( mNative ) - rv = mNative->GetFromTypeCreator( type, creator, fileExt, getter_AddRefs(info) ); + rv = mNative->GetFromTypeCreator( type, creator, fileExt.get(), getter_AddRefs(info) ); } if ( NS_SUCCEEDED( rv) ) diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp index 37c35bbf6b4..69f82eb6285 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -1908,7 +1908,7 @@ nsPrefMigration::RenameAndMove4xImapFilterFiles(nsIFileSpec * profilePath) if (!str.IsEmpty()) { // str is the hostname - rv = RenameAndMove4xImapFilterFile(profilePath,str); + rv = RenameAndMove4xImapFilterFile(profilePath,str.get()); if (NS_FAILED(rv)) { // failed to migrate. bail. return rv; diff --git a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp index 889cf2b558b..7fd897e82cf 100644 --- a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp +++ b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp @@ -296,7 +296,7 @@ nsresult nsInternetConfigService::FillMIMEInfoForICEntry(ICMapEntry& entry, nsIM // convert entry.extension which is a Str255 // don't forget to remove the '.' in front of the file extension.... nsCAutoString temp((char *)&entry.extension[2], (int)entry.extension[0]-1); - info->AppendExtension(temp); + info->AppendExtension(temp.get()); info->SetMacType(entry.fileType); info->SetMacCreator(entry.fileCreator); temp.Assign((char *) &entry.entryName[1], entry.entryName[0]); @@ -352,7 +352,7 @@ NS_IMETHODIMP nsInternetConfigService::FillInMIMEInfo(const char *mimetype, cons nsCAutoString fileExtension; fileExtension.Assign("."); fileExtension.Append(aFileExtension); - rv = GetMappingForMIMEType(mimetype, fileExtension, &entry); + rv = GetMappingForMIMEType(mimetype, fileExtension.get(), &entry); } else { @@ -379,7 +379,7 @@ NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromExtension(const char *aFil nsCAutoString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapFilename( instance, pFileName, &entry ); if( err == noErr ) @@ -401,7 +401,7 @@ NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromTypeCreator(PRUint32 aType nsCAutoString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapTypeCreator( instance, aType, aCreator, pFileName, &entry ); if( err == noErr ) diff --git a/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp b/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp index 7c8df3c787a..10c62e677d4 100644 --- a/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp +++ b/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp @@ -70,7 +70,7 @@ static nsresult MakeMIMEInfo( ICMapEntry &entry, nsIMIMEInfo*& info ) nsCString description( (char*)&entry.entryName[1], entry.entryName[0]); nsString unicodeDescription; - unicodeDescription.AssignWithConversion ( description ); + unicodeDescription.AssignWithConversion ( description.get() ); info->SetDescription( unicodeDescription.get() ); @@ -110,7 +110,7 @@ NS_IMETHODIMP nsMacMIMEDataSource::GetFromExtension(const char *aFileExt, nsIMIM nsCString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapFilename( instance, pFileName, &entry ); if( err == noErr ) @@ -131,7 +131,7 @@ NS_IMETHODIMP nsMacMIMEDataSource::GetFromTypeCreator(PRUint32 aType, PRUint32 a nsCString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapTypeCreator( instance, aType, aCreator, pFileName, &entry ); if( err == noErr ) diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index c28d2fdf609..ad215959b3d 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -1516,7 +1516,7 @@ NS_IMETHODIMP nsExternalHelperAppService::GetTypeFromFile( nsIFile* aFile, char nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); if (icService) { - rv = icService->GetMIMEInfoFromTypeCreator(type, creator, fileExt, getter_AddRefs(info)); + rv = icService->GetMIMEInfoFromTypeCreator(type, creator, fileExt.get(), getter_AddRefs(info)); if ( NS_SUCCEEDED( rv) ) return info->GetMIMEType(aContentType); } @@ -1541,7 +1541,7 @@ nsresult nsExternalHelperAppService::GetMIMEInfoForMimeTypeFromExtras(const char PRInt32 numEntries = sizeof(extraMimeEntries) / sizeof(extraMimeEntries[0]); for (PRInt32 index = 0; !*aMIMEInfo && index < numEntries; index++) { - if ( MIMEType == extraMimeEntries[index].mMimeType ) { + if ( MIMEType.Equals(extraMimeEntries[index].mMimeType) ) { // This is the one. Create MIMEInfo object and set attributes appropriately. nsCOMPtr mimeInfo (do_CreateInstance(NS_MIMEINFO_CONTRACTID,&rv)); NS_ENSURE_SUCCESS( rv, rv ); diff --git a/mozilla/widget/src/mac/nsDragService.cpp b/mozilla/widget/src/mac/nsDragService.cpp index 2ae8f9c9cd4..cf67fa340cc 100644 --- a/mozilla/widget/src/mac/nsDragService.cpp +++ b/mozilla/widget/src/mac/nsDragService.cpp @@ -718,13 +718,13 @@ nsDragService :: GetDataForFlavor ( nsISupportsArray* inDragItems, DragReference // if someone was asking for text/plain, lookup unicode instead so we can convert it. PRBool needToDoConversionToPlainText = PR_FALSE; - const char* actualFlavor = mimeFlavor; - if ( strcmp(mimeFlavor,kTextMime) == 0 ) { + const char* actualFlavor = mimeFlavor.get(); + if ( strcmp(mimeFlavor.get(),kTextMime) == 0 ) { actualFlavor = kUnicodeMime; needToDoConversionToPlainText = PR_TRUE; } else - actualFlavor = mimeFlavor; + actualFlavor = mimeFlavor.get(); *outDataSize = 0; nsCOMPtr data; diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 528bf2f59a3..89d71450702 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -1078,7 +1078,7 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) { case eInitWithPath: { - filePath = (char *)nsMemory::Clone(mWorkingPath, strlen(mWorkingPath)+1); + filePath = (char *)nsMemory::Clone(mWorkingPath.get(), mWorkingPath.Length()+1); err = ResolvePathAndSpec(filePath, nsnull, PR_FALSE, &mResolvedSpec); nsMemory::Free(filePath); break; @@ -1086,9 +1086,9 @@ nsLocalFile::ResolveAndStat(PRBool resolveTerminal) case eInitWithFSSpec: { - if (strlen(mAppendedPath)) + if (!mAppendedPath.IsEmpty()) { // We've got an FSSpec and an appended path so pass 'em both to ResolvePathAndSpec - filePath = (char *)nsMemory::Clone(mAppendedPath, strlen(mAppendedPath)+1); + filePath = (char *)nsMemory::Clone(mAppendedPath.get(), mAppendedPath.Length()+1); err = ResolvePathAndSpec(filePath, &mSpec, PR_FALSE, &mResolvedSpec); nsMemory::Free(filePath); } @@ -1350,7 +1350,7 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes) { case eInitWithPath: { - filePath = (char *)nsMemory::Clone(mWorkingPath, strlen(mWorkingPath)+1); + filePath = (char *)nsMemory::Clone(mWorkingPath.get(), mWorkingPath.Length()+1); err = ResolvePathAndSpec(filePath, nsnull, PR_TRUE, &mResolvedSpec); nsMemory::Free(filePath); break; @@ -1358,9 +1358,9 @@ nsLocalFile::Create(PRUint32 type, PRUint32 attributes) case eInitWithFSSpec: { - if (strlen(mAppendedPath)) + if (!mAppendedPath.IsEmpty()) { // We've got an FSSpec and an appended path so pass 'em both to ResolvePathAndSpec - filePath = (char *)nsMemory::Clone(mAppendedPath, strlen(mAppendedPath)+1); + filePath = (char *)nsMemory::Clone(mAppendedPath.get(), mAppendedPath.Length()+1); err = ResolvePathAndSpec(filePath, &mSpec, PR_TRUE, &mResolvedSpec); nsMemory::Free(filePath); } @@ -1578,7 +1578,7 @@ nsLocalFile::GetPath(char **_retval) switch (mInitType) { case eInitWithPath: - *_retval = (char*) nsMemory::Clone(mWorkingPath, strlen(mWorkingPath)+1); + *_retval = (char*) nsMemory::Clone(mWorkingPath.get(), mWorkingPath.Length()+1); if (!*_retval) return NS_ERROR_OUT_OF_MEMORY; break; @@ -2439,7 +2439,7 @@ nsLocalFile::GetTarget(char **_retval) return NS_ERROR_FILE_INVALID_PATH; } - *_retval = (char*) nsMemory::Clone( mResolvedPath, strlen(mResolvedPath)+1 ); + *_retval = (char*) nsMemory::Clone( mResolvedPath.get(), mResolvedPath.Length()+1 ); return NS_OK; } @@ -2500,7 +2500,7 @@ NS_IMETHODIMP nsLocalFile::GetURL(char * *aURL) // make sure we have a trailing slash escPath += "/"; } - *aURL = nsCRT::strdup((const char *)escPath); + *aURL = ToNewCString(escPath); rv = *aURL ? NS_OK : NS_ERROR_OUT_OF_MEMORY; } } @@ -2558,7 +2558,7 @@ NS_IMETHODIMP nsLocalFile::SetURL(const char * aURL) if (path.CharAt(0) == ':') path.Cut(0, 1); - rv = InitWithPath(path); + rv = InitWithPath(path.get()); return rv; @@ -3245,7 +3245,7 @@ NS_IMETHODIMP nsLocalFile::SetAppendedPath(const char *aPath) NS_IMETHODIMP nsLocalFile::GetAppendedPath(char **_retval) { NS_ENSURE_ARG_POINTER(_retval); - *_retval = (char*) nsMemory::Clone(mAppendedPath, strlen(mAppendedPath)+1); + *_retval = (char*) nsMemory::Clone(mAppendedPath.get(), mAppendedPath.Length()+1); return NS_OK; } diff --git a/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp b/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp index 889cf2b558b..7fd897e82cf 100644 --- a/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp +++ b/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp @@ -296,7 +296,7 @@ nsresult nsInternetConfigService::FillMIMEInfoForICEntry(ICMapEntry& entry, nsIM // convert entry.extension which is a Str255 // don't forget to remove the '.' in front of the file extension.... nsCAutoString temp((char *)&entry.extension[2], (int)entry.extension[0]-1); - info->AppendExtension(temp); + info->AppendExtension(temp.get()); info->SetMacType(entry.fileType); info->SetMacCreator(entry.fileCreator); temp.Assign((char *) &entry.entryName[1], entry.entryName[0]); @@ -352,7 +352,7 @@ NS_IMETHODIMP nsInternetConfigService::FillInMIMEInfo(const char *mimetype, cons nsCAutoString fileExtension; fileExtension.Assign("."); fileExtension.Append(aFileExtension); - rv = GetMappingForMIMEType(mimetype, fileExtension, &entry); + rv = GetMappingForMIMEType(mimetype, fileExtension.get(), &entry); } else { @@ -379,7 +379,7 @@ NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromExtension(const char *aFil nsCAutoString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapFilename( instance, pFileName, &entry ); if( err == noErr ) @@ -401,7 +401,7 @@ NS_IMETHODIMP nsInternetConfigService::GetMIMEInfoFromTypeCreator(PRUint32 aType nsCAutoString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapTypeCreator( instance, aType, aCreator, pFileName, &entry ); if( err == noErr ) diff --git a/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp b/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp index 7c8df3c787a..10c62e677d4 100644 --- a/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp +++ b/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp @@ -70,7 +70,7 @@ static nsresult MakeMIMEInfo( ICMapEntry &entry, nsIMIMEInfo*& info ) nsCString description( (char*)&entry.entryName[1], entry.entryName[0]); nsString unicodeDescription; - unicodeDescription.AssignWithConversion ( description ); + unicodeDescription.AssignWithConversion ( description.get() ); info->SetDescription( unicodeDescription.get() ); @@ -110,7 +110,7 @@ NS_IMETHODIMP nsMacMIMEDataSource::GetFromExtension(const char *aFileExt, nsIMIM nsCString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapFilename( instance, pFileName, &entry ); if( err == noErr ) @@ -131,7 +131,7 @@ NS_IMETHODIMP nsMacMIMEDataSource::GetFromTypeCreator(PRUint32 aType, PRUint32 a nsCString filename("foobar."); filename+=aFileExt; Str255 pFileName; - ConvertCharStringToStr255( filename, pFileName ); + ConvertCharStringToStr255( filename.get(), pFileName ); ICMapEntry entry; OSStatus err = ::ICMapTypeCreator( instance, aType, aCreator, pFileName, &entry ); if( err == noErr )