From 60f0b4fffe3de8eb1a1fc3015c2f6643fdccb57a Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Tue, 8 Jul 2008 21:16:18 +0000
Subject: [PATCH] Fixed test 554 to pass the torture test.
---
CHANGES | 3 +++
docs/libcurl/curl_formadd.3 | 4 ++--
lib/formdata.c | 2 +-
tests/libtest/lib554.c | 13 ++++++-------
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/CHANGES b/CHANGES
index 81f09e858d..475b0bad94 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
Changelog
+Daniel Fandrich (8 Jul 2008)
+- Fixed test 554 to pass the torture test.
+
Daniel Fandrich (7 Jul 2008)
- Added test cases 1034 & 1035 to test IDN name conversion failures.
diff --git a/docs/libcurl/curl_formadd.3 b/docs/libcurl/curl_formadd.3
index f3cea0054c..e55c542f2a 100644
--- a/docs/libcurl/curl_formadd.3
+++ b/docs/libcurl/curl_formadd.3
@@ -128,9 +128,9 @@ you've called \fIcurl_easy_cleanup(3)\fP for the curl handle.
See example below.
.SH RETURN VALUE
-0 means everything was ok, non-zero means an error occurred as
+0 means everything was ok, non-zero means an error occurred corresponding
+to a CURL_FORMADD_* constant defined in
.I <curl/curl.h>
-defines.
.SH EXAMPLE
.nf
diff --git a/lib/formdata.c b/lib/formdata.c
index 420f85f173..bf00a40ac5 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -705,7 +705,7 @@ CURLFORMcode FormAdd(struct curl_httppost **httppost,
}
if(CURL_FORMADD_OK == return_value) {
- /* go through the list, check for copleteness and if everything is
+ /* go through the list, check for completeness and if everything is
* alright add the HttpPost item otherwise set return_value accordingly */
post = NULL;
diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c
index 792bbbed28..fe0c16a660 100644
--- a/tests/libtest/lib554.c
+++ b/tests/libtest/lib554.c
@@ -44,11 +44,14 @@ int test(char *URL)
struct curl_httppost *lastptr=NULL;
struct WriteThis pooh;
+ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
+ fprintf(stderr, "curl_global_init() failed\n");
+ return TEST_ERR_MAJOR_BAD;
+ }
+
pooh.readptr = data;
pooh.sizeleft = strlen(data);
- curl_global_init(CURL_GLOBAL_ALL);
-
/* Fill in the file upload field */
formrc = curl_formadd(&formpost,
&lastptr,
@@ -81,13 +84,9 @@ int test(char *URL)
if(formrc)
printf("curl_formadd(3) = %d\n", (int)formrc);
- if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {
- fprintf(stderr, "curl_global_init() failed\n");
- return TEST_ERR_MAJOR_BAD;
- }
-
if ((curl = curl_easy_init()) == NULL) {
fprintf(stderr, "curl_easy_init() failed\n");
+ curl_formfree(formpost);
curl_global_cleanup();
return TEST_ERR_MAJOR_BAD;
}
--
GitLab