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

fixes bug 115164 "nsJARURI::FormatSpec does more work than it needs to do"

Browse Source 
r=dp, sr=jag
This commit is contained in:
darin%netscape.com 2001-12-15 20:34:07 +00:00
parent d9d9c68e0a
commit 1d20c0ccdf
2 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/libjar/nsJARURI.cpp
View File

@ -73,24 +73,40 @@ nsJARURI::Init()
}
#define NS_JAR_SCHEME "jar:"
#define NS_JAR_SCHEME_LEN (sizeof(NS_JAR_SCHEME)-1)
#define NS_JAR_DELIMITER "!/"
#define NS_JAR_DELIMITER_LEN (sizeof(NS_JAR_DELIMITER)-1)
nsresult
nsJARURI::FormatSpec(const char* entryPath, char* *result)
{
nsresult rv;
char* jarFileSpec;
rv = mJARFile->GetSpec(&jarFileSpec);
char* fileSpec;
nsresult rv = mJARFile->GetSpec(&fileSpec);
if (NS_FAILED(rv)) return rv;
nsCAutoString spec(NS_JAR_SCHEME);
spec += jarFileSpec;
nsCRT::free(jarFileSpec);
spec += NS_JAR_DELIMITER;
spec += entryPath;
int fileSpecLen = strlen(fileSpec);
int entryPathLen = strlen(entryPath);
*result = ToNewCString(spec);
return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
char *spec = (char *) nsMemory::Alloc(NS_JAR_SCHEME_LEN +
fileSpecLen +
NS_JAR_DELIMITER_LEN +
entryPathLen + 1);
if (!spec)
return NS_ERROR_OUT_OF_MEMORY;
*result = spec;
memcpy(spec, NS_JAR_SCHEME, NS_JAR_SCHEME_LEN);
spec += NS_JAR_SCHEME_LEN;
memcpy(spec, fileSpec, fileSpecLen);
spec += fileSpecLen;
memcpy(spec, NS_JAR_DELIMITER, NS_JAR_DELIMITER_LEN);
spec += NS_JAR_DELIMITER_LEN;
memcpy(spec, entryPath, entryPathLen);
spec[entryPathLen] = 0;
nsMemory::Free(fileSpec);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////

36
netwerk/protocol/jar/src/nsJARURI.cpp
View File

@ -73,24 +73,40 @@ nsJARURI::Init()
}
#define NS_JAR_SCHEME "jar:"
#define NS_JAR_SCHEME_LEN (sizeof(NS_JAR_SCHEME)-1)
#define NS_JAR_DELIMITER "!/"
#define NS_JAR_DELIMITER_LEN (sizeof(NS_JAR_DELIMITER)-1)
nsresult
nsJARURI::FormatSpec(const char* entryPath, char* *result)
{
nsresult rv;
char* jarFileSpec;
rv = mJARFile->GetSpec(&jarFileSpec);
char* fileSpec;
nsresult rv = mJARFile->GetSpec(&fileSpec);
if (NS_FAILED(rv)) return rv;
nsCAutoString spec(NS_JAR_SCHEME);
spec += jarFileSpec;
nsCRT::free(jarFileSpec);
spec += NS_JAR_DELIMITER;
spec += entryPath;
int fileSpecLen = strlen(fileSpec);
int entryPathLen = strlen(entryPath);
*result = ToNewCString(spec);
return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
char *spec = (char *) nsMemory::Alloc(NS_JAR_SCHEME_LEN +
fileSpecLen +
NS_JAR_DELIMITER_LEN +
entryPathLen + 1);
if (!spec)
return NS_ERROR_OUT_OF_MEMORY;
*result = spec;
memcpy(spec, NS_JAR_SCHEME, NS_JAR_SCHEME_LEN);
spec += NS_JAR_SCHEME_LEN;
memcpy(spec, fileSpec, fileSpecLen);
spec += fileSpecLen;
memcpy(spec, NS_JAR_DELIMITER, NS_JAR_DELIMITER_LEN);
spec += NS_JAR_DELIMITER_LEN;
memcpy(spec, entryPath, entryPathLen);
spec[entryPathLen] = 0;
nsMemory::Free(fileSpec);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////