lib: fix disabled-verbose-strings + enable-debug build warnings

diff --git a/lib/curl_trc.h b/lib/curl_trc.h
index 32d2251d0242786c29642c3a272f54fb01eef998..67a7f4aa10ce831f0417d3a96066cea5cd302b72 100644 (file)
--- a/lib/curl_trc.h
+++ b/lib/curl_trc.h
@@ -152,8 +152,6 @@ void Curl_infof(struct Curl_easy *data,
  */
 void Curl_trc_cf_infof(struct Curl_easy *data, struct Curl_cfilter *cf,
                        const char *fmt, ...) CURL_PRINTF(3, 4);
-void Curl_trc_ft_infof(struct Curl_easy *data, struct curl_trc_feat *ft,
-                       const char *fmt, ...) CURL_PRINTF(3, 4);
 void Curl_trc_write(struct Curl_easy *data,
                     const char *fmt, ...) CURL_PRINTF(2, 3);
 void Curl_trc_read(struct Curl_easy *data,
@@ -197,13 +195,6 @@ static void Curl_trc_cf_infof(struct Curl_easy *data,
 
 struct curl_trc_feat;
 
-static void Curl_trc_ft_infof(struct Curl_easy *data,
-                              struct curl_trc_feat *ft,
-                              const char *fmt, ...)
-{
-  (void)data; (void)ft; (void)fmt;
-}
-
 static void Curl_trc_write(struct Curl_easy *data, const char *fmt, ...)
 {
   (void)data; (void)fmt;

diff --git a/lib/http2.c b/lib/http2.c
index 71676fb3fc427a5d679ed0ff933112288cef9b9a..2c024ca55e40604a70b08bcd23ec939a2b854c02 100644 (file)
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -498,9 +498,10 @@ static int on_header(nghttp2_session *session, const nghttp2_frame *frame,
                      const uint8_t *value, size_t valuelen,
                      uint8_t flags,
                      void *userp);
+#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
 static int error_callback(nghttp2_session *session, const char *msg,
                           size_t len, void *userp);
-
+#endif
 static CURLcode cf_h2_ctx_open(struct Curl_cfilter *cf,
                                struct Curl_easy *data)
 {
@@ -530,7 +531,9 @@ static CURLcode cf_h2_ctx_open(struct Curl_cfilter *cf,
   nghttp2_session_callbacks_set_on_begin_headers_callback(
     cbs, on_begin_headers);
   nghttp2_session_callbacks_set_on_header_callback(cbs, on_header);
+#if !defined(CURL_DISABLE_VERBOSE_STRINGS)
   nghttp2_session_callbacks_set_error_callback(cbs, error_callback);
+#endif
 
   /* The nghttp2 session is not yet setup, do it */
   rc = h2_client_new(cf, cbs);

diff --git a/lib/multi.c b/lib/multi.c
index 413f4329fbce279c6b8c794c65ade05fba0da005..034ddcd97f5162f8680d8d88639b20bc8cd66096 100644 (file)
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -101,7 +101,7 @@ static void multi_xfer_bufs_free(struct Curl_multi *multi);
 static void Curl_expire_ex(struct Curl_easy *data, const struct curltime *nowp,
                            timediff_t milli, expire_id id);
 
-#ifdef DEBUGBUILD
+#if defined( DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
 static const char * const multi_statename[]={
   "INIT",
   "PENDING",