Commit fcf02cbb authored Feb 23, 2013 by Steve Holme

pingpong: Moved curl_ftptransfer definition to pingpong.h

Moved the ftp transfer structure into pingpong.h so other protocols that
require it don't have to include ftp.h.

parent 419bcf9d

lib/ftp.h

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -97,13 +97,6 @@ typedef enum {
	file */		file */
	} curl_ftpfile;		} curl_ftpfile;

	typedef enum {
	FTPTRANSFER_BODY, /* yes do transfer a body */
	FTPTRANSFER_INFO, /* do still go through to get info/headers */
	FTPTRANSFER_NONE, /* don't get anything and don't get info */
	FTPTRANSFER_LAST /* end of list marker, never used */
	} curl_ftptransfer;

	/* This FTP struct is used in the SessionHandle. All FTP data that is		/* This FTP struct is used in the SessionHandle. All FTP data that is
	connection-oriented must be in FTP_conn to properly deal with the fact that		connection-oriented must be in FTP_conn to properly deal with the fact that
	perhaps the SessionHandle is changed between the times the connection is		perhaps the SessionHandle is changed between the times the connection is

lib/imap.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@
	***************************************************************************/		***************************************************************************/

	#include "pingpong.h"		#include "pingpong.h"
	#include "ftp.h"

	/****************************************************************************		/****************************************************************************
	* IMAP unique setup		* IMAP unique setup

lib/pingpong.h

+7 −0

Original line number	Original line	Diff line number	Diff line
	@@ -32,6 +32,13 @@
	/* forward-declaration, this is defined in urldata.h */		/* forward-declaration, this is defined in urldata.h */
	struct connectdata;		struct connectdata;

			typedef enum {
			FTPTRANSFER_BODY, /* yes do transfer a body */
			FTPTRANSFER_INFO, /* do still go through to get info/headers */
			FTPTRANSFER_NONE, /* don't get anything and don't get info */
			FTPTRANSFER_LAST /* end of list marker, never used */
			} curl_ftptransfer;

	/*		/*
	* 'pingpong' is the generic struct used for protocols doing server<->client		* 'pingpong' is the generic struct used for protocols doing server<->client
	* conversations in a back-and-forth style such as FTP, IMAP, POP3, SMTP etc.		* conversations in a back-and-forth style such as FTP, IMAP, POP3, SMTP etc.