Unverified Commit ad547fcf authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

travis: add build for "configure --disable-verbose" 

Closes #3144
parent 6b6ba1dc

.travis.yml

+7 −1
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ matrix: 
          compiler: gcc

          dist: trusty

          env: T=normal C="--enable-ares"

        - os: linux

          compiler: gcc

          dist: trusty

          env: T=normal C="--disable-verbose" CPPFLAGS="-Wno-variadic-macros" NOTESTS=1

        - os: linux

          compiler: gcc

          dist: trusty
@@ -296,7 +300,9 @@ script: 
        if [ "$T" = "normal" ]; then

             ./configure --enable-warnings --enable-werror $C

             make && make examples

             if [ -z $NOTESTS ]; then

                make test-nonflaky

             fi

             if [ -n $CHECKSRC ]; then

                make checksrc

             fi

lib/arpa_telnet.h

+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -37,6 +37,7 @@ 
#define CURL_NEW_ENV_VAR   0

#define CURL_NEW_ENV_VALUE 1



#ifndef CURL_DISABLE_VERBOSE_STRINGS

/*

 * The telnet options represented as strings

 */
@@ -53,6 +54,7 @@ static const char * const telnetoptions[]= 
  "TERM SPEED",  "LFLOW",          "LINEMODE",      "XDISPLOC",

  "OLD-ENVIRON", "AUTHENTICATION", "ENCRYPT",       "NEW-ENVIRON"

};

#endif



#define CURL_TELOPT_MAXIMUM CURL_TELOPT_NEW_ENVIRON
@@ -76,6 +78,7 @@ static const char * const telnetoptions[]= 
#define CURL_DONT 254 /* DON'T use this option! */

#define CURL_IAC  255 /* Interpret As Command */



#ifndef CURL_DISABLE_VERBOSE_STRINGS

/*

 * Then those numbers represented as strings:

 */
@@ -86,6 +89,7 @@ static const char * const telnetcmds[]= 
  "AYT",  "EC",    "EL",    "GA",   "SB",

  "WILL", "WONT",  "DO",    "DONT", "IAC"

};

#endif



#define CURL_TELCMD_MINIMUM CURL_xEOF /* the first one */

#define CURL_TELCMD_MAXIMUM CURL_IAC  /* surprise, 255 is the last one! ;-) */

lib/doh.c

+8 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#define DNS_CLASS_IN 0x01

#define DOH_MAX_RESPONSE_SIZE 3000 /* bytes */



#ifndef CURL_DISABLE_VERBOSE_STRINGS

static const char * const errors[]={

  "",

  "Bad label",
@@ -63,6 +64,7 @@ static const char *doh_strerror(DOHcode code) 
    return errors[code];

  return "bad error code";

}

#endif



#ifdef DEBUGBUILD

#define UNITTEST
@@ -640,6 +642,7 @@ UNITTEST DOHcode doh_decode(unsigned char *doh, 
  return DOH_OK; /* ok */

}



#ifndef CURL_DISABLE_VERBOSE_STRINGS

static void showdoh(struct Curl_easy *data,

                    struct dohentry *d)

{
@@ -675,6 +678,9 @@ static void showdoh(struct Curl_easy *data, 
    infof(data, "CNAME: %s\n", d->cname[i].alloc);

  }

}

#else

#define showdoh(x,y)

#endif



/*

 * doh2ai()
@@ -791,10 +797,12 @@ doh2ai(const struct dohentry *de, const char *hostname, int port) 
  return firstai;

}



#ifndef CURL_DISABLE_VERBOSE_STRINGS

static const char *type2name(DNStype dnstype)

{

  return (dnstype == DNS_TYPE_A)?"A":"AAAA";

}

#endif



UNITTEST void de_cleanup(struct dohentry *d)

{

lib/http2.c

+4 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,8 @@ static ssize_t data_source_read_callback(nghttp2_session *session, 
  return nread;

}



#ifdef NGHTTP2_HAS_ERROR_CALLBACK

#if defined(NGHTTP2_HAS_ERROR_CALLBACK) &&      \

  !defined(CURL_DISABLE_VERBOSE_STRINGS)

static int error_callback(nghttp2_session *session,

                          const char *msg,

                          size_t len,
@@ -1226,7 +1227,9 @@ CURLcode Curl_http2_init(struct connectdata *conn) 
    /* nghttp2_on_header_callback */

    nghttp2_session_callbacks_set_on_header_callback(callbacks, on_header);



#ifndef CURL_DISABLE_VERBOSE_STRINGS

    nghttp2_session_callbacks_set_error_callback(callbacks, error_callback);

#endif



    /* The nghttp2 session is not yet setup, do it */

    rc = nghttp2_session_client_new(&conn->proto.httpc.h2, callbacks, conn);

lib/sendf.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void Curl_failf(struct Curl_easy *, const char *fmt, ...); 
#elif defined(HAVE_VARIADIC_MACROS_GCC)

#define infof(x...)  Curl_nop_stmt

#else

#define infof (void)

#error "missing VARIADIC macro define, fix and rebuild!"

#endif



#else /* CURL_DISABLE_VERBOSE_STRINGS */