moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

ftp: convert state names to a global array

Browse Source 
... just to make them easier to print in debug ouputs while debugging.
They are still within #ifdef [debugbuild].
This commit is contained in:
Daniel Stenberg 2013-08-14 22:28:32 +02:00
parent f34b5fb4d8
commit d5e2d0b6bf
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/ftp.c
View File

@ -775,17 +775,9 @@ CURLcode Curl_GetFTPResponse(ssize_t *nreadp, /* return number of bytes read */
return result; return result;
} }
/* This is the ONLY way to change FTP state! */
static void _state(struct connectdata *conn,
ftpstate newstate
#ifdef DEBUGBUILD
, int lineno
#endif
)
{
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
/* for debug purposes */ /* for debug purposes */
static const char * const names[]={ static const char * const ftp_state_names[]={
"STOP", "STOP",
"WAIT220", "WAIT220",
"AUTH", "AUTH",
@ -823,11 +815,21 @@ static void _state(struct connectdata *conn,
"QUIT" "QUIT"
}; };
#endif #endif
/* This is the ONLY way to change FTP state! */
static void _state(struct connectdata *conn,
ftpstate newstate
#ifdef DEBUGBUILD
, int lineno
#endif
)
{
struct ftp_conn *ftpc = &conn->proto.ftpc; struct ftp_conn *ftpc = &conn->proto.ftpc;
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
if(ftpc->state != newstate) if(ftpc->state != newstate)
infof(conn->data, "FTP %p (line %d) state change from %s to %s\n", infof(conn->data, "FTP %p (line %d) state change from %s to %s\n",
(void *)ftpc, lineno, names[ftpc->state], names[newstate]); (void *)ftpc, lineno, ftp_state_names[ftpc->state],
ftp_state_names[newstate]);
#endif #endif
ftpc->state = newstate; ftpc->state = newstate;
} }