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

Class nsprPath has been renamed to nsNSPRPath; straggler references were being converted with a typedef, this was confusing Solaris, so I'm converting all nsprPath references to the new name, hope that's Ok.

Browse Source
This commit is contained in:
mcafee%netscape.com 1999-05-10 05:34:26 +00:00
parent 33f6514e9f
commit de36a26dbc
12 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/public/nsFileSpec.h
View File

@ -753,6 +753,4 @@ private:
char* modifiedNSPRPath; // Currently used only on XP_PC
}; // class nsNSPRPath
typedef nsNSPRPath nsprPath; // old name.
#endif // _FILESPEC_H_

2
silentdl/nsSilentDownload.cpp
View File

@ -783,7 +783,7 @@ nsSilentDownloadTask::SetNextByte(PRInt32 aNextByte)
NS_IMETHODIMP
nsSilentDownloadTask::GetOutFile(nsString& aOutFile)
{
aOutFile.SetString(nsprPath(*mOutFile));
aOutFile.SetString(nsNSPRPath(*mOutFile));
return NS_OK;
}

2
webshell/tests/viewer/nsViewerApp.cpp
View File

@ -205,7 +205,7 @@ nsViewerApp::AutoregisterComponents()
#else
sysdir += "components";
#endif /* XP_MAC */
nsprPath componentsDir(sysdir);
nsNSPRPath componentsDir(sysdir);
const char *componentsDirPath = (const char *) componentsDir;
if (componentsDirPath != NULL)
{

2
xpcom/io/nsFileSpec.h
View File

@ -753,6 +753,4 @@ private:
char* modifiedNSPRPath; // Currently used only on XP_PC
}; // class nsNSPRPath
typedef nsNSPRPath nsprPath; // old name.
#endif // _FILESPEC_H_

2
xpcom/libxpt/xptinfo/src/nsInterfaceInfoManager.cpp
View File

@ -347,7 +347,7 @@ nsInterfaceInfoManager::initInterfaceTables()
continue;
// XXX this assumes ASCII strings are returned from nsFileSpec. Is this valid?
nsprPath path(spec);
nsNSPRPath path(spec);
const char* fullname = path; // path needs to stay in scope, beacuse fullname refers to an internal member
int flen = PL_strlen(fullname);
if (flen < 4 || PL_strcasecmp(&(fullname[flen - 4]), ".xpt"))

2
xpcom/reflect/xptinfo/src/nsInterfaceInfoManager.cpp
View File

@ -347,7 +347,7 @@ nsInterfaceInfoManager::initInterfaceTables()
continue;
// XXX this assumes ASCII strings are returned from nsFileSpec. Is this valid?
nsprPath path(spec);
nsNSPRPath path(spec);
const char* fullname = path; // path needs to stay in scope, beacuse fullname refers to an internal member
int flen = PL_strlen(fullname);
if (flen < 4 || PL_strcasecmp(&(fullname[flen - 4]), ".xpt"))

2
xpfe/bootstrap/nsSetupRegistry.cpp
View File

@ -100,7 +100,7 @@ nsresult NS_AutoregisterComponents()
if (NS_FAILED(rv))
return rv;
nsprPath componentsDir(sysdir);
nsNSPRPath componentsDir(sysdir);
const char *componentsDirPath = (const char *) componentsDir;
if (componentsDirPath != NULL)
{

6
xpinstall/src/nsInstall.cpp
View File

@ -157,7 +157,7 @@ nsInstallInfo::MakeTempFile(nsString aURL, nsString& tempFileString)
if (aURL.Compare(nsString("file://").GetUnicode(), false, 7) == 0)
{
tempFileString.SetString( nsprPath(nsFileURL(aURL)) );
tempFileString.SetString( nsNSPRPath(nsFileURL(aURL)) );
}
else
{
@ -177,7 +177,7 @@ nsInstallInfo::MakeTempFile(nsString aURL, nsString& tempFileString)
tempFile.MakeUnique();
tempFileString.SetString( nsprPath( nsFilePath(tempFile) ) );
tempFileString.SetString( nsNSPRPath( nsFilePath(tempFile) ) );
}
}
@ -3240,7 +3240,7 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedNa
// We will overwrite what is in the way. is this something that we want to do?
extractHereSpec->Delete(PR_FALSE);
result = ZIP_ExtractFile( mJarFileData, nsAutoCString(aJarfile), nsprPath( *extractHereSpec ) );
result = ZIP_ExtractFile( mJarFileData, nsAutoCString(aJarfile), nsNSPRPath( *extractHereSpec ) );
if (result == 0)
{

2
xpinstall/src/nsInstallFile.cpp
View File

@ -251,7 +251,7 @@ nsInstallFile::RegisterInVersionRegistry()
}
VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName),
(char*)(const char*)nsprPath(*mFinalFile),
(char*)(const char*)nsNSPRPath(*mFinalFile),
(char*)(const char*)nsAutoCString(regPackageName),
PR_FALSE );

12
xpinstall/src/nsInstallPatch.cpp
View File

@ -249,7 +249,7 @@ PRInt32 nsInstallPatch::Complete()
char* tempVersion = tempVersionString.ToNewCString();
err = VR_Install( tempRegName,
(char*) (const char *) nsprPath(*mTargetFile),
(char*) (const char *) nsNSPRPath(*mTargetFile),
tempVersion,
PR_FALSE );
@ -314,7 +314,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
DIFFDATA *dd;
PRInt32 status = GDIFF_ERR_MEM;
char *tmpurl = NULL;
char *realfile = PL_strdup(nsprPath(sourceFile)); // needs to be sourceFile!!!
char *realfile = PL_strdup(nsNSPRPath(sourceFile)); // needs to be sourceFile!!!
nsFileSpec outFileSpec = sourceFile;
dd = (DIFFDATA *)PR_Calloc( 1, sizeof(DIFFDATA));
@ -331,7 +331,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
dd->bufsize = BUFSIZE;
// validate patch header & check for special instructions
dd->fDiff = PR_Open (nsprPath(patchFile), PR_RDONLY, 0666);
dd->fDiff = PR_Open (nsNSPRPath(patchFile), PR_RDONLY, 0666);
if (dd->fDiff != NULL)
@ -383,7 +383,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
{
// set
PL_strfree(realfile);
realfile = PL_strdup(nsprPath(tempMacFile));
realfile = PL_strdup(nsNSPRPath(tempMacFile));
}
}
#endif
@ -414,7 +414,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
outFileSpec.SetLeafName(newFileName); //????
outFileSpec.MakeUnique();
char *outFile = PL_strdup(nsprPath(outFileSpec));
char *outFile = PL_strdup(nsNSPRPath(outFileSpec));
// apply patch to the source file
dd->fSrc = PR_Open ( realfile, PR_RDONLY, 0666);
@ -556,7 +556,7 @@ nsInstallPatch::HashFilePath(const nsFilePath& aPath)
{
PRUint32 rv = 0;
char* cPath = PL_strdup(nsprPath(aPath));
char* cPath = PL_strdup(nsNSPRPath(aPath));
if(cPath != nsnull)
{

2
xpinstall/src/nsSoftwareUpdate.cpp
View File

@ -126,7 +126,7 @@ nsSoftwareUpdate::Startup()
/***************************************/
nsSpecialSystemDirectory appDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
VR_SetRegDirectory( nsprPath(appDir) );
VR_SetRegDirectory( nsNSPRPath(appDir) );
NR_StartupRegistry(); /* startup the registry; if already started, this will essentially be a noop */

2
xpinstall/src/nsSoftwareUpdateRun.cpp
View File

@ -164,7 +164,7 @@ GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *
installJSFileSpec.MakeUnique();
// Extract the install.js file.
rv = ZIP_ExtractFile( hZip, "install.js", nsprPath(installJSFileSpec) );
rv = ZIP_ExtractFile( hZip, "install.js", nsNSPRPath(installJSFileSpec) );
if (rv != ZIP_OK)
{
ZIP_CloseArchive(&hZip);