Use curl_global_init() and curl_global_cleanup().

Improve cleanup in case of initialization failure.

1 files changed, 31 insertions, 21 deletions

diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c
index ddec600b0..dc0efcaa1 100644
--- a/tests/libtest/lib508.c
+++ b/tests/libtest/lib508.c
@@ -34,34 +34,44 @@ int test(char *URL)
   pooh.readptr = data;
   pooh.sizeleft = strlen(data);
 
-  curl = curl_easy_init();
-  if(curl) {
-    /* First set the URL that is about to receive our POST. */
-    curl_easy_setopt(curl, CURLOPT_URL, URL);
+  if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+    fprintf(stderr, "curl_global_init() failed\n");
+    return TEST_ERR_MAJOR_BAD;
+  }
 
-    /* Now specify we want to POST data */
-    curl_easy_setopt(curl, CURLOPT_POST, TRUE);
+  if ((curl = curl_easy_init()) == NULL) {
+    fprintf(stderr, "curl_easy_init() failed\n");
+    curl_global_cleanup();
+    return TEST_ERR_MAJOR_BAD;
+  }
 
-    /* Set the expected POST size */
-    curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
+  /* First set the URL that is about to receive our POST. */
+  curl_easy_setopt(curl, CURLOPT_URL, URL);
 
-    /* we want to use our own read function */
-    curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
+  /* Now specify we want to POST data */
+  curl_easy_setopt(curl, CURLOPT_POST, TRUE);
 
-    /* pointer to pass to our read function */
-    curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
+  /* Set the expected POST size */
+  curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)pooh.sizeleft);
 
-    /* get verbose debug output please */
-    curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+  /* we want to use our own read function */
+  curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback);
 
-    /* include headers in the output */
-    curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+  /* pointer to pass to our read function */
+  curl_easy_setopt(curl, CURLOPT_INFILE, &pooh);
 
-    /* Perform the request, res will get the return code */
-    res = curl_easy_perform(curl);
+  /* get verbose debug output please */
+  curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
+
+  /* include headers in the output */
+  curl_easy_setopt(curl, CURLOPT_HEADER, TRUE);
+
+  /* Perform the request, res will get the return code */
+  res = curl_easy_perform(curl);
+
+  /* always cleanup */
+  curl_easy_cleanup(curl);
+  curl_global_cleanup();
 
-    /* always cleanup */
-    curl_easy_cleanup(curl);
-  }
   return res;
 }