enable more GCC/clang warnings, fix reported warnings

Author: bradh352

CMakeLists.txt

@@ -564,7 +564,7 @@ SET (RECVFROM_TYPE_ARG5 "struct sockaddr *")
 SET (RECV_TYPE_ARG4 int)
 SET (GETNAMEINFO_TYPE_ARG1 "struct sockaddr *")
 SET (GETNAMEINFO_TYPE_ARG7 int)
-SET (SEND_TYPE_ARG2 "void *")
+SET (SEND_TYPE_ARG2 "const void *")
 SET (SEND_TYPE_ARG4 int)
 ################################################################################
 

Makefile.dj

@@ -21,9 +21,12 @@ OBJ_DIR = djgpp
 
 CFLAGS = -g -O2 -I./include -I./src/lib \
          -I$(WATT32_ROOT)/inc \
+         -std=c90 \
          -Wall \
          -Wextra \
+         -Waggregate-return \
          -Wcast-align \
+         -Wcast-qual \
          -Wconversion \
          -Wdeclaration-after-statement \
          -Wdouble-promotion \
@@ -40,19 +43,22 @@ CFLAGS = -g -O2 -I./include -I./src/lib \
          -Wno-coverage-mismatch \
          -Wold-style-definition \
          -Wpacked \
+         -Wpedantic \
          -Wpointer-arith \
          -Wshadow \
          -Wsign-conversion \
          -Wstrict-overflow \
          -Wstrict-prototypes \
          -Wtrampolines \
          -Wundef \
+         -Wunreachable-code \
          -Wunused \
          -Wvariadic-macros \
          -Wvla \
          -Wwrite-strings \
          -Werror=implicit-int \
          -Werror=implicit-function-declaration \
+         -Wno-long-long \
          -DWATT32 -DHAVE_CONFIG_H   \
          -D_REENTRANT \
          -DCARES_NO_DEPRECATED \

cmake/EnableWarnings.cmake

@@ -305,7 +305,9 @@ else ()
 		-Wextra
 
 		# Enable additional warnings not covered by Wall and Wextra.
+		-Waggregate-return
 		-Wcast-align
+		-Wcast-qual
 		-Wconversion
 		-Wdeclaration-after-statement
 		-Wdouble-promotion
@@ -323,6 +325,7 @@ else ()
 		-Wno-coverage-mismatch
 		-Wold-style-definition
 		-Wpacked
+		-Wpedantic
 		-Wpointer-arith
 		-Wredundant-decls
 		-Wshadow
@@ -331,6 +334,7 @@ else ()
 		-Wstrict-prototypes
 		-Wtrampolines
 		-Wundef
+		-Wunreachable-code
 		-Wunused
 		-Wvariadic-macros
 		-Wvla
@@ -349,6 +353,8 @@ else ()
 		# Some clang versions might warn if an argument like "-I/path/to/headers" is unused,
 		# silence these.
 		-Qunused-arguments
+
+		-Wno-long-long
 	)
 
 	# C++ flags:

configure.ac

@@ -245,42 +245,8 @@ AC_SUBST(CARES_SYMBOL_HIDING_CFLAG)
 
 
 if test "$enable_warnings" = "yes"; then
-  AX_APPEND_COMPILE_FLAGS([-Wall \
-    -Wextra \
-    -Wcast-align \
-    -Wconversion \
-    -Wdeclaration-after-statement \
-    -Wdouble-promotion \
-    -Wfloat-equal \
-    -Wformat-security \
-    -Winit-self \
-    -Wjump-misses-init \
-    -Wlogical-op \
-    -Wmissing-braces \
-    -Wmissing-declarations \
-    -Wmissing-format-attribute \
-    -Wmissing-include-dirs \
-    -Wmissing-prototypes \
-    -Wnested-externs \
-    -Wno-coverage-mismatch \
-    -Wold-style-definition \
-    -Wpacked \
-    -Wpointer-arith \
-    -Wredundant-decls \
-    -Wshadow \
-    -Wsign-conversion \
-    -Wstrict-overflow \
-    -Wstrict-prototypes \
-    -Wtrampolines \
-    -Wundef \
-    -Wunused \
-    -Wvariadic-macros \
-    -Wvla \
-    -Wwrite-strings \
-    -Werror=implicit-int \
-    -Werror=implicit-function-declaration \
-    -Werror=partial-availability \
-  ], [AM_CFLAGS], [-Werror])
+  AX_APPEND_COMPILE_FLAGS([-std=c90 -Wall -Wextra -Waggregate-return -Wcast-align -Wcast-qual -Wconversion -Wdeclaration-after-statement -Wdouble-promotion -Wfloat-equal -Wformat-security -Winit-self -Wjump-misses-init -Wlogical-op -Wmissing-braces -Wmissing-declarations -Wmissing-format-attribute -Wmissing-include-dirs -Wmissing-prototypes -Wnested-externs -Wno-coverage-mismatch -Wold-style-definition -Wpacked -Wpedantic -Wpointer-arith -Wredundant-decls -Wshadow -Wsign-conversion -Wstrict-overflow -Wstrict-prototypes -Wtrampolines -Wundef -Wunreachable-code -Wunused -Wvariadic-macros -Wvla -Wwrite-strings -Werror=implicit-int -Werror=implicit-function-declaration -Werror=partial-availability -Wno-long-long ],
+    [AM_CFLAGS], [-Werror])
 fi
 
 if test "$ax_cv_c_compiler_vendor" = "intel"; then
@@ -663,7 +629,7 @@ recvfrom_type_arg5="struct sockaddr *"
 recv_type_arg4=int
 getnameinfo_type_arg1="struct sockaddr *"
 getnameinfo_type_arg7=int
-send_type_arg2="void *"
+send_type_arg2="const void *"
 send_type_arg4=int
 
 AC_DEFINE_UNQUOTED([RECVFROM_TYPE_RETV],     [ ${recvfrom_type_retv} ],     [ recvfrom() return value ])

include/ares_dns_record.h

@@ -94,7 +94,7 @@ typedef enum {
   ARES_OPCODE_IQUERY = 1, /*!< Inverse query. Obsolete. */
   ARES_OPCODE_STATUS = 2, /*!< Name server status query */
   ARES_OPCODE_NOTIFY = 4, /*!< Zone change notification (RFC 1996) */
-  ARES_OPCODE_UPDATE = 5, /*!< Zone update message (RFC2136) */
+  ARES_OPCODE_UPDATE = 5  /*!< Zone update message (RFC2136) */
 } ares_dns_opcode_t;
 
 /*! DNS Header flags */
@@ -108,7 +108,7 @@ typedef enum {
   ARES_FLAG_AD = 1 << 5, /*!< RFC 2065. Authentic Data bit indicates in a
                           * response that the data included has been verified by
                           * the server providing it */
-  ARES_FLAG_CD = 1 << 6, /*!< RFC 2065. Checking Disabled bit indicates in a
+  ARES_FLAG_CD = 1 << 6  /*!< RFC 2065. Checking Disabled bit indicates in a
                           * query that non-verified data is acceptable to the
                           * resolver sending the query. */
 } ares_dns_flags_t;
@@ -152,7 +152,7 @@ typedef enum {
   ARES_RCODE_BADNAME   = 20, /*!< RFC 2930. Duplicate Key Name */
   ARES_RCODE_BADALG    = 21, /*!< RFC 2930. Algorithm not supported */
   ARES_RCODE_BADTRUNC  = 22, /*!< RFC 8945. Bad Truncation */
-  ARES_RCODE_BADCOOKIE = 23, /*!< RVC 7973. Bad/missing Server Cookie */
+  ARES_RCODE_BADCOOKIE = 23  /*!< RVC 7973. Bad/missing Server Cookie */
 } ares_dns_rcode_t;
 
 /*! Data types used */
@@ -169,7 +169,7 @@ typedef enum {
                               *   printable. Guaranteed to have a NULL
                               *   terminator for convenience (not included in
                               *   length) */
-  ARES_DATATYPE_OPT = 10,    /*!< Array of options.  16bit identifier, BIN
+  ARES_DATATYPE_OPT = 10     /*!< Array of options.  16bit identifier, BIN
                               *   data. */
 } ares_dns_datatype_t;
 
@@ -292,7 +292,7 @@ typedef enum {
   /*! RAW Record. RR Type. Datatype: U16 */
   ARES_RR_RAW_RR_TYPE = (ARES_REC_TYPE_RAW_RR * 100) + 1,
   /*! RAW Record. RR Data. Datatype: BIN */
-  ARES_RR_RAW_RR_DATA = (ARES_REC_TYPE_RAW_RR * 100) + 2,
+  ARES_RR_RAW_RR_DATA = (ARES_REC_TYPE_RAW_RR * 100) + 2
 } ares_dns_rr_key_t;
 
 /*! TLSA Record ARES_RR_TLSA_CERT_USAGE known values */
@@ -372,7 +372,7 @@ typedef enum {
   /*! RFC 8145. Signaling Trust Anchor Knowledge in DNSSEC */
   ARES_OPT_PARAM_EDNS_KEY_TAG = 14,
   /*! RFC 8914. Extended ERROR code and message */
-  ARES_OPT_PARAM_EXTENDED_DNS_ERROR = 15,
+  ARES_OPT_PARAM_EXTENDED_DNS_ERROR = 15
 } ares_opt_param_t;
 
 /*! Data type for option records for keys like ARES_RR_OPT_OPTIONS and

src/lib/ares__addrinfo2hostent.c

@@ -165,13 +165,13 @@ ares_status_t ares__addrinfo2hostent(const struct ares_addrinfo *ai, int family,
       if (family == AF_INET6) {
         memcpy(
           (*host)->h_addr_list[i],
-          &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
+          &(CARES_INADDR_CAST(const struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
           (size_t)(*host)->h_length);
       }
       if (family == AF_INET) {
         memcpy(
           (*host)->h_addr_list[i],
-          &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
+          &(CARES_INADDR_CAST(const struct sockaddr_in *, next->ai_addr)->sin_addr),
           (size_t)(*host)->h_length);
       }
       ++i;
@@ -256,7 +256,7 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
 
       memcpy(
         &addr6ttls[*naddrttls].ip6addr,
-        &(CARES_INADDR_CAST(struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
+        &(CARES_INADDR_CAST(const struct sockaddr_in6 *, next->ai_addr)->sin6_addr),
         sizeof(struct ares_in6_addr));
     } else {
       if (next->ai_ttl > cname_ttl) {
@@ -266,7 +266,7 @@ ares_status_t ares__addrinfo2addrttl(const struct ares_addrinfo *ai, int family,
       }
       memcpy(
         &addrttls[*naddrttls].ipaddr,
-        &(CARES_INADDR_CAST(struct sockaddr_in *, next->ai_addr)->sin_addr),
+        &(CARES_INADDR_CAST(const struct sockaddr_in *, next->ai_addr)->sin_addr),
         sizeof(struct in_addr));
     }
     (*naddrttls)++;

src/lib/ares_event_configchg.c

@@ -473,7 +473,7 @@ ares_status_t ares_event_configchg_init(ares_event_configchg_t **configchg,
       continue;
     }
 
-    pdns_configuration_notify_key =
+    pdns_configuration_notify_key = (const char *(*)(void))
       dlsym(handle, "dns_configuration_notify_key");
     if (pdns_configuration_notify_key != NULL) {
       break;

src/lib/ares_gethostbyname.c

@@ -102,13 +102,17 @@ static void ares_gethostbyname_callback(void *arg, int status, int timeouts,
 void ares_gethostbyname(ares_channel_t *channel, const char *name, int family,
                         ares_host_callback callback, void *arg)
 {
-  const struct ares_addrinfo_hints hints = { ARES_AI_CANONNAME, family, 0, 0 };
-  struct host_query               *ghbn_arg;
+  struct ares_addrinfo_hints hints;
+  struct host_query         *ghbn_arg;
 
   if (!callback) {
     return;
   }
 
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_flags  = ARES_AI_CANONNAME;
+  hints.ai_family = family;
+
   ghbn_arg = ares_malloc(sizeof(*ghbn_arg));
   if (!ghbn_arg) {
     callback(arg, ARES_ENOMEM, 0, NULL);

src/lib/ares_getnameinfo.c

@@ -100,11 +100,11 @@ static void  ares_getnameinfo_int(ares_channel_t        *channel,
   /* Validate socket address family and length */
   if (sa && sa->sa_family == AF_INET &&
       salen >= (ares_socklen_t)sizeof(struct sockaddr_in)) {
-    addr = CARES_INADDR_CAST(struct sockaddr_in *, sa);
+    addr = CARES_INADDR_CAST(const struct sockaddr_in *, sa);
     port = addr->sin_port;
   } else if (sa && sa->sa_family == AF_INET6 &&
              salen >= (ares_socklen_t)sizeof(struct sockaddr_in6)) {
-    addr6 = CARES_INADDR_CAST(struct sockaddr_in6 *, sa);
+    addr6 = CARES_INADDR_CAST(const struct sockaddr_in6 *, sa);
     port  = addr6->sin6_port;
   } else {
     callback(arg, ARES_ENOTIMP, 0, NULL, NULL);

src/lib/ares_private.h

@@ -41,7 +41,7 @@
  * warning: cast from 'const struct sockaddr *' to 'const struct sockaddr_in6 *'
  * increases required alignment from 1 to 4 [-Wcast-align]
  */
-#define CARES_INADDR_CAST(type, var) ((type)((void *)var))
+#define CARES_INADDR_CAST(type, var) ((type)((const void *)var))
 
 #if defined(USE_WINSOCK)