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

Fix a lot of warnings by not using "basename" as a variable as it happens to be defined globally as a function.

Browse Source
This commit is contained in:
rjc%netscape.com 1999-06-26 09:25:22 +00:00
parent 837414868d
commit c9825ba220
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rdf/datasource/src/nsFTPDataSource.cpp
View File

@ -447,15 +447,15 @@ FTPDataSource::GetName(nsIRDFResource *source, nsIRDFLiteral** aResult)
// unescape basename
rv = NS_ERROR_NULL_POINTER;
char *basename = url.ToNewCString();
if (basename)
char *baseFilename = url.ToNewCString();
if (baseFilename)
{
basename = nsUnescape(basename);
if (basename)
baseFilename = nsUnescape(baseFilename);
if (baseFilename)
{
url = basename;
delete [] basename;
basename = nsnull;
url = baseFilename;
delete [] baseFilename;
baseFilename = nsnull;
nsIRDFLiteral *literal;
if (NS_SUCCEEDED(rv = gRDFService->GetLiteral(url.GetUnicode(), &literal)))

16
rdf/datasource/src/nsFileSystemDataSource.cpp
View File

@ -886,14 +886,14 @@ FileSystemDataSource::isVisible(const nsNativeFileSpec& file)
}
}
#else
char *basename = file.GetLeafName();
if (nsnull != basename)
char *baseFilename = file.GetLeafName();
if (nsnull != baseFilename)
{
if ((!strcmp(basename, ".")) || (!strcmp(basename, "..")))
if ((!strcmp(baseFilename, ".")) || (!strcmp(baseFilename, "..")))
{
isVisible = PR_FALSE;
}
nsCRT::free(basename);
nsCRT::free(baseFilename);
}
#endif
@ -949,16 +949,16 @@ FileSystemDataSource::GetName(nsIRDFResource *source, nsIRDFLiteral **aResult)
source->GetValue( getter_Copies(uri) );
nsFileURL url(uri);
nsNativeFileSpec native(url);
char *basename = native.GetLeafName();
char *baseFilename = native.GetLeafName();
if (! basename)
if (! baseFilename)
return NS_ERROR_OUT_OF_MEMORY;
nsAutoString name(basename);
nsAutoString name(baseFilename);
nsIRDFLiteral *literal;
gRDFService->GetLiteral(name.GetUnicode(), &literal);
*aResult = literal;
nsCRT::free(basename);
nsCRT::free(baseFilename);
return NS_OK;
}

60
rdf/datasource/src/nsSearchDataSource.cpp
View File

@ -228,7 +228,7 @@ static PRBool isSearchURI(nsIRDFResource* aResource);
static nsresult BeginSearchRequest(nsIRDFResource *source);
static nsresult DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsString text);
static nsresult GetSearchEngineList();
static nsresult ReadFileContents(char *basename, nsString & sourceContents);
static nsresult ReadFileContents(char *baseFilename, nsString & sourceContents);
static nsresult GetData(nsString data, char *sectionToFind, char *attribToFind, nsString &value);
static nsresult GetInputs(nsString data, nsString text, nsString &input);
static nsresult GetURL(nsIRDFResource *source, nsIRDFLiteral** aResult);
@ -812,18 +812,18 @@ SearchDataSource::BeginSearchRequest(nsIRDFResource *source)
// loop over specified search engines
while (engineArray->Count() > 0)
{
char *basename = (char *)(engineArray->ElementAt(0));
char *baseFilename = (char *)(engineArray->ElementAt(0));
engineArray->RemoveElementAt(0);
if (!basename) continue;
if (!baseFilename) continue;
#ifdef DEBUG
printf("Search engine to query: '%s'\n", basename);
printf("Search engine to query: '%s'\n", baseFilename);
#endif
nsCOMPtr<nsIRDFResource> engine;
gRDFService->GetResource(basename, getter_AddRefs(engine));
delete [] basename;
basename = nsnull;
gRDFService->GetResource(baseFilename, getter_AddRefs(engine));
delete [] baseFilename;
baseFilename = nsnull;
if (!engine) continue;
DoSearch(source, engine, text);
}
@ -873,15 +873,15 @@ SearchDataSource::DoSearch(nsIRDFResource *source, nsIRDFResource *engine, nsStr
if (engineStr.Find(kEngineProtocol) != 0)
return(rv);
engineStr.Cut(0, sizeof(kEngineProtocol) - 1);
char *basename = engineStr.ToNewCString();
if (!basename)
char *baseFilename = engineStr.ToNewCString();
if (!baseFilename)
return(rv);
basename = nsUnescape(basename);
if (!basename)
baseFilename = nsUnescape(baseFilename);
if (!baseFilename)
return(rv);
rv = ReadFileContents(basename, data);
delete [] basename;
basename = nsnull;
rv = ReadFileContents(baseFilename, data);
delete [] baseFilename;
baseFilename = nsnull;
if (NS_FAILED(rv))
{
return(rv);
@ -1052,15 +1052,15 @@ SearchDataSource::GetSearchEngineList()
nsAutoString searchURL(kEngineProtocol);
searchURL += uri;
char *basename = uri.ToNewCString();
if (!basename) continue;
basename = nsUnescape(basename);
if (!basename) continue;
char *baseFilename = uri.ToNewCString();
if (!baseFilename) continue;
baseFilename = nsUnescape(baseFilename);
if (!baseFilename) continue;
nsAutoString data("");
rv = ReadFileContents(basename, data);
delete [] basename;
basename = nsnull;
rv = ReadFileContents(baseFilename, data);
delete [] baseFilename;
baseFilename = nsnull;
if (NS_FAILED(rv)) continue;
nsCOMPtr<nsIRDFResource> searchRes;
@ -1085,8 +1085,8 @@ SearchDataSource::GetSearchEngineList()
delete [] searchURI;
searchURI = nsnull;
}
delete [] basename;
basename = nsnull;
delete [] baseFilename;
baseFilename = nsnull;
}
}
}
@ -1115,14 +1115,14 @@ SearchDataSource::isVisible(const nsNativeFileSpec& file)
}
}
#else
char *basename = file.GetLeafName();
if (nsnull != basename)
char *baseFilename = file.GetLeafName();
if (nsnull != baseFilename)
{
if ((!strcmp(basename, ".")) || (!strcmp(basename, "..")))
if ((!strcmp(baseFilename, ".")) || (!strcmp(baseFilename, "..")))
{
isVisible = PR_FALSE;
}
nsCRT::free(basename);
nsCRT::free(baseFilename);
}
#endif
@ -1132,7 +1132,7 @@ SearchDataSource::isVisible(const nsNativeFileSpec& file)
nsresult
SearchDataSource::ReadFileContents(char *basename, nsString& sourceContents)
SearchDataSource::ReadFileContents(char *baseFilename, nsString& sourceContents)
{
nsresult rv = NS_OK;
@ -1145,7 +1145,7 @@ SearchDataSource::ReadFileContents(char *basename, nsString& sourceContents)
searchEngine += "rdf";
searchEngine += "search";
#endif
searchEngine += basename;
searchEngine += baseFilename;
#ifdef XP_MAC
// be sure to resolve aliases in case we encounter one
@ -1181,7 +1181,7 @@ SearchDataSource::ReadFileContents(char *basename, nsString& sourceContents)
{
childPath.Cut(0, separatorOffset+1);
}
if (childPath.EqualsIgnoreCase(basename))
if (childPath.EqualsIgnoreCase(baseFilename))
{
searchFile = fileSpec;
}