corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 782594 - Don't return nsresult from main() (netwerk/); r=bz

Browse Source
This commit is contained in:
Aryeh Gregor
2012-08-07 20:17:27 +03:00
parent 5177ca91e8
commit 342e2f3c35
12 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
netwerk/streamconv/test/TestStreamConv.cpp
View File

@@ -178,12 +178,12 @@ main(int argc, char* argv[])
nsCOMPtr<nsICategoryManager> catman =
do_GetService(NS_CATEGORYMANAGER_CONTRACTID, &rv);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
nsCString previous;
nsCOMPtr<nsIStreamConverterService> StreamConvService =
do_GetService(kStreamConverterServiceCID, &rv);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
// Define the *from* content type and *to* content-type for conversion.
static const char fromStr[] = "a/foo";
@@ -201,14 +201,14 @@ main(int argc, char* argv[])
nsCOMPtr<nsIChannel> channel;
nsCOMPtr<nsIURI> dummyURI;
rv = NS_NewURI(getter_AddRefs(dummyURI), "http://meaningless");
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
rv = NS_NewInputStreamChannel(getter_AddRefs(channel),
dummyURI,
nullptr, // inStr
"text/plain", // content-type
-1); // XXX fix contentLength
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
nsCOMPtr<nsIRequest> request(do_QueryInterface(channel));
#endif
@@ -227,7 +227,7 @@ main(int argc, char* argv[])
nsIStreamListener *converterListener = nullptr;
rv = StreamConvService->AsyncConvertData(fromStr, toStr,
dataReceiver, nullptr, &converterListener);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
NS_RELEASE(dataReceiver);
// at this point we have a stream listener to push data to, and the one
@@ -235,17 +235,17 @@ main(int argc, char* argv[])
// going. Typically these On*() calls would be made inside their respective wrappers On*()
// methods.
rv = converterListener->OnStartRequest(request, nullptr);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
rv = SEND_DATA("aaa");
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
rv = SEND_DATA("aaa");
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
// Finish the request.
rv = converterListener->OnStopRequest(request, nullptr, rv);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
NS_RELEASE(converterListener);
#else
@@ -253,7 +253,7 @@ main(int argc, char* argv[])
nsCOMPtr<nsIInputStream> convertedData;
rv = StreamConvService->Convert(inputData, fromStr, toStr,
nullptr, getter_AddRefs(convertedData));
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
#endif
// Enter the message pump to allow the URL load to proceed.
@@ -264,5 +264,5 @@ main(int argc, char* argv[])
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
NS_ShutdownXPCOM(nullptr);
return rv;
return 0;
}

6
netwerk/test/PropertiesTest.cpp
View File

@@ -40,14 +40,14 @@ main(int argc, char* argv[])
nsIInputStream* in = nullptr;
nsCOMPtr<nsIIOService> service(do_GetService(kIOServiceCID, &ret));
if (NS_FAILED(ret)) return ret;
if (NS_FAILED(ret)) return 1;
nsIChannel *channel = nullptr;
ret = service->NewChannel(NS_LITERAL_CSTRING(TEST_URL), nullptr, nullptr, &channel);
if (NS_FAILED(ret)) return ret;
if (NS_FAILED(ret)) return 1;
ret = channel->Open(&in);
if (NS_FAILED(ret)) return ret;
if (NS_FAILED(ret)) return 1;
nsIPersistentProperties* props;
ret = CallCreateInstance(kPersistentPropertiesCID, &props);

4
netwerk/test/TestBlockingSocket.cpp
View File

@@ -110,7 +110,7 @@ main(int argc, char* argv[])
nsCOMPtr<nsIFile> file;
rv = NS_NewNativeLocalFile(nsDependentCString(fileName), false, getter_AddRefs(file));
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
rv = RunBlockingTest(nsDependentCString(hostName), port, file);
#if defined(PR_LOGGING)
@@ -126,5 +126,5 @@ main(int argc, char* argv[])
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
rv = NS_ShutdownXPCOM(nullptr);
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
return NS_OK;
return 0;
}

6
netwerk/test/TestCallbacks.cpp
View File

@@ -221,14 +221,14 @@ int main(int argc, char *argv[]) {
}
rv = NS_InitXPCOM2(nullptr, nullptr, nullptr);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
if (cmdLineURL) {
rv = StartLoad(argv[1]);
} else {
rv = StartLoad("http://badhostnamexyz/test.txt");
}
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
// Enter the message pump to allow the URL load to proceed.
PumpEvents();
@@ -237,7 +237,7 @@ int main(int argc, char *argv[]) {
if (gError) {
fprintf(stderr, "\n\n-------ERROR-------\n\n");
}
return rv;
return 0;
}
nsresult StartLoad(const char *aURISpec) {

2
netwerk/test/TestOpen.cpp
View File

@@ -33,7 +33,7 @@ main(int argc, char **argv)
return -1;
nsresult rv = NS_InitXPCOM2(nullptr, nullptr, nullptr);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
char buf[256];

14
netwerk/test/TestPageLoad.cpp
View File

@@ -25,11 +25,11 @@ nsresult auxLoad(char *uriBuf);
//----------------------------------------------------------------------
#define RETURN_IF_FAILED(rv, step) \
#define RETURN_IF_FAILED(rv, ret, step) \
PR_BEGIN_MACRO \
if (NS_FAILED(rv)) { \
printf(">>> %s failed: rv=%x\n", step, rv); \
return rv;\
return ret;\
} \
PR_END_MACRO
@@ -296,11 +296,11 @@ nsresult auxLoad(char *uriBuf)
printf("\n");
uriList.AppendObject(uri);
rv = NS_NewChannel(getter_AddRefs(chan), uri, nullptr, nullptr, callbacks);
RETURN_IF_FAILED(rv, "NS_NewChannel");
RETURN_IF_FAILED(rv, rv, "NS_NewChannel");
gKeepRunning++;
rv = chan->AsyncOpen(listener, myBool);
RETURN_IF_FAILED(rv, "AsyncOpen");
RETURN_IF_FAILED(rv, rv, "AsyncOpen");
return NS_OK;
@@ -337,17 +337,17 @@ int main(int argc, char **argv)
nsCOMPtr<nsIInterfaceRequestor> callbacks = new MyNotifications();
rv = NS_NewURI(getter_AddRefs(baseURI), argv[1]);
RETURN_IF_FAILED(rv, "NS_NewURI");
RETURN_IF_FAILED(rv, -1, "NS_NewURI");
rv = NS_NewChannel(getter_AddRefs(chan), baseURI, nullptr, nullptr, callbacks);
RETURN_IF_FAILED(rv, "NS_OpenURI");
RETURN_IF_FAILED(rv, -1, "NS_OpenURI");
gKeepRunning++;
//TIMER STARTED-----------------------
printf("Starting clock ... \n");
start = PR_Now();
rv = chan->AsyncOpen(listener, nullptr);
RETURN_IF_FAILED(rv, "AsyncOpen");
RETURN_IF_FAILED(rv, -1, "AsyncOpen");
PumpEvents();

4
netwerk/test/TestProtocols.cpp
View File

@@ -835,7 +835,7 @@ main(int argc, char* argv[])
*/
rv = NS_InitXPCOM2(nullptr, nullptr, nullptr);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
{
int i;
@@ -887,5 +887,5 @@ main(int argc, char* argv[])
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
NS_ShutdownXPCOM(nullptr);
return rv;
return NS_FAILED(rv) ? -1 : 0;
}

4
netwerk/test/TestSTSParser.cpp
View File

@@ -92,11 +92,11 @@ main(int32_t argc, char *argv[])
// grab handle to the service
nsCOMPtr<nsIStrictTransportSecurityService> stss;
stss = do_GetService("@mozilla.org/stsservice;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, -1);
nsCOMPtr<nsIPermissionManager> pm;
pm = do_GetService("@mozilla.org/permissionmanager;1", &rv);
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, -1);
int rv0, rv1;

4
netwerk/test/TestServ.cpp
View File

@@ -127,7 +127,7 @@ main(int argc, char* argv[])
*/
rv = NS_InitXPCOM2(nullptr, nullptr, nullptr);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
{
rv = MakeServer(atoi(argv[1]));
@@ -141,5 +141,5 @@ main(int argc, char* argv[])
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
NS_ShutdownXPCOM(nullptr);
return rv;
return 0;
}

2
netwerk/test/TestStreamLoader.cpp
View File

@@ -85,5 +85,5 @@ int main(int argc, char **argv)
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
NS_ShutdownXPCOM(nullptr);
return rv;
return 0;
}

6
netwerk/test/TestUpload.cpp
View File

@@ -127,16 +127,16 @@ main(int argc, char* argv[])
true,
nsDependentCString(fileName), // XXX UTF-8
0, ioService);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
// create our url.
nsCOMPtr<nsIURI> uri;
rv = NS_NewURI(getter_AddRefs(uri), uriSpec);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
nsCOMPtr<nsIChannel> channel;
rv = ioService->NewChannelFromURI(uri, getter_AddRefs(channel));
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv)) return -1;
// QI and set the upload stream
nsCOMPtr<nsIUploadChannel> uploadChannel(do_QueryInterface(channel));

25
netwerk/test/urltest.cpp
View File

@@ -380,11 +380,9 @@ int main(int argc, char **argv)
if (test_common_init(&argc, &argv) != 0)
return -1;
int rv = -1;
if (argc < 2) {
printusage();
return NS_OK;
return 0;
}
{
nsCOMPtr<nsIServiceManager> servMan;
@@ -404,7 +402,7 @@ int main(int argc, char **argv)
if (i+1 >= argc)
{
printusage();
return NS_OK;
return 0;
}
}
else if (PL_strcasecmp(argv[i], "-abs") == 0)
@@ -421,7 +419,7 @@ int main(int argc, char **argv)
if (i+1 >= argc)
{
printusage();
return NS_OK;
return 0;
}
gFileIO = argv[i+1];
i++;
@@ -434,13 +432,19 @@ int main(int argc, char **argv)
PRTime startTime = PR_Now();
if (bMakeAbs)
{
rv = (url && relativePath)
? doMakeAbsTest(url, relativePath)
: doMakeAbsTest();
if (url && relativePath) {
doMakeAbsTest(url, relativePath);
} else {
doMakeAbsTest();
}
}
else
{
rv = gFileIO ? testURL(0, urlFactory) : testURL(url, urlFactory);
if (gFileIO) {
testURL(0, urlFactory);
} else {
testURL(url, urlFactory);
}
}
if (gFileIO)
{
@@ -450,6 +454,5 @@ int main(int argc, char **argv)
}
} // this scopes the nsCOMPtrs
// no nsCOMPtrs are allowed to be alive when you call NS_ShutdownXPCOM
rv = NS_ShutdownXPCOM(nullptr);
return rv;
return NS_FAILED(NS_ShutdownXPCOM(nullptr)) ? 1 : 0;
}