removed curl_formparse() from the library

4 files changed, 18 insertions, 41 deletions

diff --git a/docs/TODO b/docs/TODO
index e988c5c91..b16362bb9 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -201,8 +201,6 @@ TODO
  * curl_easy_cleanup() returns void, but curl_multi_cleanup() returns a
    CURLMcode. These should be changed to be the same.
 
- * curl_formparse() should be removed
-
  * remove obsolete defines from curl/curl.h
 
  * remove the following functions from the public API:
diff --git a/docs/libcurl/Makefile.am b/docs/libcurl/Makefile.am
index dc2f6a85d..eff5e51d9 100644
--- a/docs/libcurl/Makefile.am
+++ b/docs/libcurl/Makefile.am
@@ -6,10 +6,10 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 
 man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3	\
  curl_easy_perform.3 curl_easy_setopt.3 curl_easy_duphandle.3		\
- curl_formparse.3 curl_formadd.3 curl_formfree.3 curl_getdate.3		\
- curl_getenv.3 curl_slist_append.3 curl_slist_free_all.3		\
- curl_version.3 curl_version_info.3 curl_escape.3 curl_unescape.3	\
- curl_free.3 curl_strequal.3 curl_mprintf.3 curl_global_init.3		\
+ curl_formadd.3 curl_formfree.3 curl_getdate.3 curl_getenv.3		\
+ curl_slist_append.3 curl_slist_free_all.3 curl_version.3		\
+ curl_version_info.3 curl_escape.3 curl_unescape.3 curl_free.3		\
+ curl_strequal.3 curl_mprintf.3 curl_global_init.3			\
  curl_global_cleanup.3 curl_multi_add_handle.3 curl_multi_cleanup.3	\
  curl_multi_fdset.3 curl_multi_info_read.3 curl_multi_init.3		\
  curl_multi_perform.3 curl_multi_remove_handle.3 curl_share_cleanup.3	\
@@ -19,34 +19,32 @@ man_MANS = curl_easy_cleanup.3 curl_easy_getinfo.3 curl_easy_init.3	\
 
 HTMLPAGES = curl_easy_cleanup.html curl_easy_getinfo.html		\
  curl_easy_init.html curl_easy_perform.html curl_easy_setopt.html	\
- curl_easy_duphandle.html curl_formadd.html curl_formparse.html		\
- curl_formfree.html curl_getdate.html curl_getenv.html			\
- curl_slist_append.html curl_slist_free_all.html curl_version.html	\
- curl_version_info.html curl_escape.html curl_unescape.html		\
- curl_free.html curl_strequal.html curl_mprintf.html			\
- curl_global_init.html curl_global_cleanup.html				\
+ curl_easy_duphandle.html curl_formadd.html curl_formfree.html		\
+ curl_getdate.html curl_getenv.html curl_slist_append.html		\
+ curl_slist_free_all.html curl_version.html curl_version_info.html	\
+ curl_escape.html curl_unescape.html curl_free.html curl_strequal.html	\
+ curl_mprintf.html curl_global_init.html curl_global_cleanup.html	\
  curl_multi_add_handle.html curl_multi_cleanup.html			\
  curl_multi_fdset.html curl_multi_info_read.html curl_multi_init.html	\
  curl_multi_perform.html curl_multi_remove_handle.html			\
  curl_share_cleanup.html curl_share_init.html curl_share_setopt.html	\
  libcurl.html libcurl-multi.html libcurl-easy.html libcurl-share.html	\
- libcurl-errors.html curl_easy_strerror.html curl_multi_strerror.html \
+ libcurl-errors.html curl_easy_strerror.html curl_multi_strerror.html	\
  curl_share_strerror.html
 
 PDFPAGES = curl_easy_cleanup.pdf curl_easy_getinfo.pdf			\
  curl_easy_init.pdf curl_easy_perform.pdf curl_easy_setopt.pdf		\
- curl_easy_duphandle.pdf curl_formadd.pdf curl_formparse.pdf		\
- curl_formfree.pdf curl_getdate.pdf curl_getenv.pdf			\
- curl_slist_append.pdf curl_slist_free_all.pdf curl_version.pdf		\
- curl_version_info.pdf curl_escape.pdf curl_unescape.pdf curl_free.pdf	\
- curl_strequal.pdf curl_mprintf.pdf curl_global_init.pdf		\
- curl_global_cleanup.pdf curl_multi_add_handle.pdf			\
- curl_multi_cleanup.pdf curl_multi_fdset.pdf curl_multi_info_read.pdf	\
- curl_multi_init.pdf curl_multi_perform.pdf				\
+ curl_easy_duphandle.pdf curl_formadd.pdf curl_formfree.pdf		\
+ curl_getdate.pdf curl_getenv.pdf curl_slist_append.pdf			\
+ curl_slist_free_all.pdf curl_version.pdf curl_version_info.pdf		\
+ curl_escape.pdf curl_unescape.pdf curl_free.pdf curl_strequal.pdf	\
+ curl_mprintf.pdf curl_global_init.pdf curl_global_cleanup.pdf		\
+ curl_multi_add_handle.pdf curl_multi_cleanup.pdf curl_multi_fdset.pdf	\
+ curl_multi_info_read.pdf curl_multi_init.pdf curl_multi_perform.pdf	\
  curl_multi_remove_handle.pdf curl_share_cleanup.pdf			\
  curl_share_init.pdf curl_share_setopt.pdf libcurl.pdf			\
  libcurl-multi.pdf libcurl-easy.pdf libcurl-share.pdf			\
- libcurl-errors.pdf curl_easy_strerror.pdf curl_multi_strerror.pdf      \
+ libcurl-errors.pdf curl_easy_strerror.pdf curl_multi_strerror.pdf	\
  curl_share_strerror.pdf
 
 CLEANFILES = $(HTMLPAGES) $(PDFPAGES)
diff --git a/docs/libcurl/curl_formparse.3 b/docs/libcurl/curl_formparse.3
deleted file mode 100644
index bc7accba3..000000000
--- a/docs/libcurl/curl_formparse.3
+++ /dev/null
@@ -1,18 +0,0 @@
-.\" You can view this file with:
-.\" nroff -man [file]
-.\" $Id$
-.\"
-.TH curl_formparse 3 "17 Dec 2001" "libcurl 7.9.2" "libcurl Manual"
-.SH NAME
-curl_formparse - add a section to a multipart/formdata HTTP POST:
-deprecated (use curl_formadd instead)
-.SH SYNOPSIS
-.B #include <curl/curl.h>
-.sp
-.BI "CURLcode curl_formparse(char * " string, " struct HttpPost ** " firstitem,
-.BI "struct HttpPost ** " lastitem ");"
-.ad
-.SH DESCRIPTION
-This has been removed deliberately. The \fBcurl_formadd\fP has been introduced
-to replace this function. Do not use this. Convert to the new function
-now. curl_formparse() will be removed from a future version of libcurl.
diff --git a/docs/libcurl/index.html b/docs/libcurl/index.html
index 817ffe6dd..6d4f133c2 100644
--- a/docs/libcurl/index.html
+++ b/docs/libcurl/index.html
@@ -29,7 +29,6 @@
 <br><a href="curl_escape.html">curl_escape</A>
 <br><a href="curl_formadd.html">curl_formadd</A>
 <br><a href="curl_formfree.html">curl_formfree</A>
-<br><a href="curl_formparse.html">curl_formparse</A>
 <br><a href="curl_free.html">curl_free</A>
 <br><a href="curl_getdate.html">curl_getdate</A>
 <br><a href="curl_getenv.html">curl_getenv</A>