From f08ac8683418e2d241f12661521f003eef902720 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sun, 25 Mar 2007 02:30:58 +0000
Subject: fix compiler warning

---
 lib/cookie.c |  4 ++++
 lib/ftp.c    | 15 ++++++++-------
 lib/ssluse.c |  4 ++++
 lib/telnet.c |  8 ++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/cookie.c b/lib/cookie.c
index 41a366d2d..4a33845ab 100644
--- a/lib/cookie.c
+++ b/lib/cookie.c
@@ -188,6 +188,10 @@ Curl_cookie_add(struct SessionHandle *data,
   bool replace_old = FALSE;
   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 */
   co = (struct Cookie *)calloc(sizeof(struct Cookie), 1);
   if(!co)
diff --git a/lib/ftp.c b/lib/ftp.c
index d0c69f243..51bd16411 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -109,16 +109,22 @@
 #define NIFLAGS NI_NUMERICHOST | NI_NUMERICSERV
 #endif
 
+#ifdef CURL_DISABLE_VERBOSE_STRINGS
+#define ftp_pasv_verbose(a,b,c,d)  do { } while (0)
+#endif
+
 /* Local API functions */
 static CURLcode ftp_sendquote(struct connectdata *conn,
                               struct curl_slist *quote);
 static CURLcode ftp_quit(struct connectdata *conn);
 static CURLcode ftp_parse_url_path(struct connectdata *conn);
 static CURLcode ftp_regular_transfer(struct connectdata *conn, bool *done);
+#ifndef CURL_DISABLE_VERBOSE_STRINGS
 static void ftp_pasv_verbose(struct connectdata *conn,
                              Curl_addrinfo *ai,
                              char *newhost, /* ascii version */
                              int port);
+#endif
 static CURLcode ftp_state_post_rest(struct connectdata *conn);
 static CURLcode ftp_state_post_cwd(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.
  *
  */
+#ifndef CURL_DISABLE_VERBOSE_STRINGS
 static void
 ftp_pasv_verbose(struct connectdata *conn,
                  Curl_addrinfo *ai,
                  char *newhost, /* ascii version */
                  int port)
 {
-#ifdef CURL_DISABLE_VERBOSE_STRINGS
-  (void)conn;
-  (void)ai;
-  (void)newhost;
-  (void)port;
-#else
   char buf[256];
   Curl_printable_address(ai, buf, sizeof(buf));
   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
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 815289df7..593f23857 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -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;
   struct SessionHandle *data = conn->data;
 
+#ifdef CURL_DISABLE_VERBOSE_STRINGS
+  (void)prefix;
+#endif
+
   if(!data->set.verbose)
     return 0;
 
diff --git a/lib/telnet.c b/lib/telnet.c
index 756f358f4..621e5f908 100644
--- a/lib/telnet.c
+++ b/lib/telnet.c
@@ -95,6 +95,10 @@
 #define  CURL_SB_EOF(x) (x->subpointer >= x->subend)
 #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
 typedef FARPROC WSOCK2_FUNC;
 static CURLcode check_wsock2 ( struct SessionHandle *data );
@@ -105,9 +109,11 @@ void telrcv(struct connectdata *,
             unsigned char *inbuf,       /* Data received from socket */
             ssize_t count);             /* Number of bytes received */
 
+#ifndef CURL_DISABLE_VERBOSE_STRINGS
 static void printoption(struct SessionHandle *data,
                         const char *direction,
                         int cmd, int option);
+#endif
 
 static void negotiate(struct connectdata *);
 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,
                         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)
 {
-- 
cgit v1.2.3