Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 155466 clean up test consumers to correctly use NS_ShutdownXPCOM

Browse Source 
r=dmose, sr=scc, moa: dougt, dbradley, gagan, harish, akk


git-svn-id: svn://10.0.0.236/trunk@124683 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mac.com
2002-07-04 14:29:25 +00:00
parent c8967dfdcb
commit 585baa0803
35 changed files with 1781 additions and 1691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mozilla/parser/htmlparser/tests/outsinks/Convert.cpp
View File

@@ -287,23 +287,30 @@ Usage: %s [-i intype] [-o outtype] [-f flags] [-w wrapcol] [-c comparison_file]
exit(1);
}
}
else file = stdin;
else
file = stdin;
nsresult ret;
{
nsCOMPtr<nsIServiceManager> servMan;
NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull);
nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servMan);
NS_ASSERTION(registrar, "Null nsIComponentRegistrar");
registrar->AutoRegister(nsnull);
nsCOMPtr<nsIServiceManager> servMan;
NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull);
nsCOMPtr<nsIComponentRegistrar> registrar = do_QueryInterface(servMan);
NS_ASSERTION(registrar, "Null nsIComponentRegistrar");
registrar->AutoRegister(nsnull);
// Read in the string: very inefficient, but who cares?
nsString inString;
int c;
while ((c = getc(file)) != EOF)
inString.Append(PRUnichar(c));
// Read in the string: very inefficient, but who cares?
nsString inString;
int c;
while ((c = getc(file)) != EOF)
inString.Append(PRUnichar(c));
if (file != stdin)
fclose(file);
if (file != stdin)
fclose(file);
return HTML2text(inString, inType, outType, flags, wrapCol, compareAgainst);
ret = HTML2text(inString, inType, outType, flags, wrapCol, compareAgainst);
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
nsresult rv = NS_ShutdownXPCOM( NULL );
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
return ret;
}