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.
This commit is contained in:
Steve Holme 2013-02-23 15:26:26 +00:00
parent 419bcf9d60
commit fcf02cbb75
3 changed files with 7 additions and 8 deletions

View File

@ -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

View File

@ -23,7 +23,6 @@
***************************************************************************/ ***************************************************************************/
#include "pingpong.h" #include "pingpong.h"
#include "ftp.h"
/**************************************************************************** /****************************************************************************
* IMAP unique setup * IMAP unique setup

View File

@ -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.