Commit f08ac868 authored by Yang Tse's avatar Yang Tse
Browse files

fix compiler warning

parent d6eca892
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,10 @@ Curl_cookie_add(struct SessionHandle *data,
  bool replace_old = FALSE;
  bool replace_old = FALSE;
  bool badcookie = FALSE; /* cookies are good by default. mmmmm yummy */
  bool badcookie = FALSE; /* cookies are good by default. mmmmm yummy */


#ifdef CURL_DISABLE_VERBOSE_STRINGS
  (void)data;
#endif

  /* First, alloc and init a new struct for it */
  /* First, alloc and init a new struct for it */
  co = (struct Cookie *)calloc(sizeof(struct Cookie), 1);
  co = (struct Cookie *)calloc(sizeof(struct Cookie), 1);
  if(!co)
  if(!co)
+8 −7
Original line number Original line Diff line number Diff line
@@ -109,16 +109,22 @@
#define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
#define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
#endif
#endif


#ifdef CURL_DISABLE_VERBOSE_STRINGS
#define ftp_pasv_verbose(a,b,c,d)  do { } while (0)
#endif

/* Local API functions */
/* Local API functions */
static CURLcode ftp_sendquote(struct connectdata *conn,
static CURLcode ftp_sendquote(struct connectdata *conn,
                              struct curl_slist *quote);
                              struct curl_slist *quote);
static CURLcode ftp_quit(struct connectdata *conn);
static CURLcode ftp_quit(struct connectdata *conn);
static CURLcode ftp_parse_url_path(struct connectdata *conn);
static CURLcode ftp_parse_url_path(struct connectdata *conn);
static CURLcode ftp_regular_transfer(struct connectdata *conn, bool *done);
static CURLcode ftp_regular_transfer(struct connectdata *conn, bool *done);
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void ftp_pasv_verbose(struct connectdata *conn,
static void ftp_pasv_verbose(struct connectdata *conn,
                             Curl_addrinfo *ai,
                             Curl_addrinfo *ai,
                             char *newhost, /* ascii version */
                             char *newhost, /* ascii version */
                             int port);
                             int port);
#endif
static CURLcode ftp_state_post_rest(struct connectdata *conn);
static CURLcode ftp_state_post_rest(struct connectdata *conn);
static CURLcode ftp_state_post_cwd(struct connectdata *conn);
static CURLcode ftp_state_post_cwd(struct connectdata *conn);
static CURLcode ftp_state_quote(struct connectdata *conn,
static CURLcode ftp_state_quote(struct connectdata *conn,
@@ -3238,23 +3244,18 @@ static CURLcode ftp_nb_type(struct connectdata *conn,
 * possibly new IP address.
 * possibly new IP address.
 *
 *
 */
 */
#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void
static void
ftp_pasv_verbose(struct connectdata *conn,
ftp_pasv_verbose(struct connectdata *conn,
                 Curl_addrinfo *ai,
                 Curl_addrinfo *ai,
                 char *newhost, /* ascii version */
                 char *newhost, /* ascii version */
                 int port)
                 int port)
{
{
#ifdef CURL_DISABLE_VERBOSE_STRINGS
  (void)conn;
  (void)ai;
  (void)newhost;
  (void)port;
#else
  char buf[256];
  char buf[256];
  Curl_printable_address(ai, buf, sizeof(buf));
  Curl_printable_address(ai, buf, sizeof(buf));
  infof(conn->data, "Connecting to %s (%s) port %d\n", newhost, buf, port);
  infof(conn->data, "Connecting to %s (%s) port %d\n", newhost, buf, port);
#endif
}
}
#endif


/*
/*
  Check if this is a range download, and if so, set the internal variables
  Check if this is a range download, and if so, set the internal variables
+4 −0
Original line number Original line Diff line number Diff line
@@ -859,6 +859,10 @@ static int Curl_ASN1_UTCTIME_output(struct connectdata *conn,
  int year=0,month=0,day=0,hour=0,minute=0,second=0;
  int year=0,month=0,day=0,hour=0,minute=0,second=0;
  struct SessionHandle *data = conn->data;
  struct SessionHandle *data = conn->data;


#ifdef CURL_DISABLE_VERBOSE_STRINGS
  (void)prefix;
#endif

  if(!data->set.verbose)
  if(!data->set.verbose)
    return 0;
    return 0;


+8 −0
Original line number Original line Diff line number Diff line
@@ -95,6 +95,10 @@
#define  CURL_SB_EOF(x) (x->subpointer >= x->subend)
#define  CURL_SB_EOF(x) (x->subpointer >= x->subend)
#define  CURL_SB_LEN(x) (x->subend - x->subpointer)
#define  CURL_SB_LEN(x) (x->subend - x->subpointer)


#ifdef CURL_DISABLE_VERBOSE_STRINGS
#define printoption(a,b,c,d)  do { } while (0)
#endif

#ifdef USE_WINSOCK
#ifdef USE_WINSOCK
typedef FARPROC WSOCK2_FUNC;
typedef FARPROC WSOCK2_FUNC;
static CURLcode check_wsock2 ( struct SessionHandle *data );
static CURLcode check_wsock2 ( struct SessionHandle *data );
@@ -105,9 +109,11 @@ void telrcv(struct connectdata *,
            unsigned char *inbuf,       /* Data received from socket */
            unsigned char *inbuf,       /* Data received from socket */
            ssize_t count);             /* Number of bytes received */
            ssize_t count);             /* Number of bytes received */


#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void printoption(struct SessionHandle *data,
static void printoption(struct SessionHandle *data,
                        const char *direction,
                        const char *direction,
                        int cmd, int option);
                        int cmd, int option);
#endif


static void negotiate(struct connectdata *);
static void negotiate(struct connectdata *);
static void send_negotiation(struct connectdata *, int cmd, int option);
static void send_negotiation(struct connectdata *, int cmd, int option);
@@ -244,6 +250,7 @@ static void negotiate(struct connectdata *conn)
  }
  }
}
}


#ifndef CURL_DISABLE_VERBOSE_STRINGS
static void printoption(struct SessionHandle *data,
static void printoption(struct SessionHandle *data,
                        const char *direction, int cmd, int option)
                        const char *direction, int cmd, int option)
{
{
@@ -282,6 +289,7 @@ static void printoption(struct SessionHandle *data,
    }
    }
  }
  }
}
}
#endif


static void send_negotiation(struct connectdata *conn, int cmd, int option)
static void send_negotiation(struct connectdata *conn, int cmd, int option)
{
{