Revert "Imported Upstream version 7.53.1"

[platform/upstream/curl.git] / tests / libtest / lib570.c

diff --git a/tests/libtest/lib570.c b/tests/libtest/lib570.c
index 9d9b5a1..2dc57b7 100644 (file)
--- a/tests/libtest/lib570.c
+++ b/tests/libtest/lib570.c
@@ -40,8 +40,7 @@ int test(char *URL)
     return TEST_ERR_MAJOR_BAD;
   }
 
-  curl = curl_easy_init();
-  if(!curl) {
+  if((curl = curl_easy_init()) == NULL) {
     fprintf(stderr, "curl_easy_init() failed\n");
     curl_global_cleanup();
     return TEST_ERR_MAJOR_BAD;
@@ -55,8 +54,7 @@ int test(char *URL)
 
   test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_OPTIONS);
 
-  stream_uri = suburl(URL, request++);
-  if(!stream_uri) {
+  if((stream_uri = suburl(URL, request++)) == NULL) {
     res = TEST_ERR_MAJOR_BAD;
     goto test_cleanup;
   }
@@ -76,8 +74,7 @@ int test(char *URL)
                     "RAW/RAW/UDP;unicast;client_port=3056-3057");
   test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_SETUP);
 
-  stream_uri = suburl(URL, request++);
-  if(!stream_uri) {
+  if((stream_uri = suburl(URL, request++)) == NULL) {
     res = TEST_ERR_MAJOR_BAD;
     goto test_cleanup;
   }
@@ -91,8 +88,7 @@ int test(char *URL)
 
   test_setopt(curl, CURLOPT_RTSP_REQUEST, CURL_RTSPREQ_PLAY);
 
-  stream_uri = suburl(URL, request++);
-  if(!stream_uri) {
+  if((stream_uri = suburl(URL, request++)) == NULL) {
     res = TEST_ERR_MAJOR_BAD;
     goto test_cleanup;
   }