Merge pull request #339 from jajik/fix-warnings

Fix compile warnings on clang and includes + minor tweaks

Author: jajik

native/CMakeLists.txt

@@ -13,7 +13,7 @@ IF(WIN32)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /O2 /Wall /Z7")
     SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Wall /Zi")
 ELSE()
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -std=gnu99 -fPIC -Wall -Wextra")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -std=gnu99 -fPIC -Wall -Wextra -Werror")
     SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -p -O1 -std=gnu99 -fPIC -Wall -Wextra")
 ENDIF()
 

native/advertise/mod_advertise.c

@@ -706,6 +706,7 @@ static void advertise_info(request_rec *r)
 /* List of directives specific to our module.                               */
 /*                                                                          */
 /*--------------------------------------------------------------------------*/
+/* clang-format off */
 static const command_rec cmd_table[] = {
     AP_INIT_TAKE12("ServerAdvertise", /* directive name               */
                    cmd_advertise_m,   /* config action routine        */
@@ -737,9 +738,9 @@ static const command_rec cmd_table[] = {
                   NULL,                   /* argument to include in call  */
                   RSRC_CONF,              /* where available              */
                   "Local adress to bind to for Multicast logic"),
-    {NULL},
-
+    {.name = NULL},
 };
+/* clang-format on */
 
 /*--------------------------------------------------------------------------*/
 /*                                                                          */

native/balancers/mod_lbmethod_cluster.c

@@ -445,14 +445,17 @@ static const char *cmd_proxyhctemplate(cmd_parms *cmd, void *dummy, const char *
     return NULL;
 }
 
+/* clang-format off */
 static const command_rec lbmethod_cmds[] = {
     AP_INIT_FLAG("UseNocanon", cmd_nocanon, NULL, OR_ALL,
                  "UseNocanon - When no ProxyPass or ProxyMatch for the URL, passes the URL path \"raw\" to the backend "
                  "(Default: Off)"),
     AP_INIT_RAW_ARGS(
         "ModProxyClusterHCTemplate", cmd_proxyhctemplate, NULL, OR_ALL,
         "ModProxyClusterHCTemplate - Set of health check parameters to use with mod_lbmethod_cluster workers."),
-    {NULL}};
+    {.name = NULL}
+};
+/* clang-format on */
 
 static void register_hooks(apr_pool_t *p)
 {

native/include/balancer.h

@@ -45,11 +45,6 @@ struct balancerinfo
 };
 typedef struct balancerinfo balancerinfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Insert(alloc) and update a balancer record in the shared table
  * @param s pointer to the shared table

native/include/context.h

@@ -50,11 +50,6 @@ struct contextinfo
 };
 typedef struct contextinfo contextinfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Insert(alloc) and update a context record in the shared table
  * @param s pointer to the shared table

native/include/domain.h

@@ -40,11 +40,6 @@ struct domaininfo
 };
 typedef struct domaininfo domaininfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Insert(alloc) and update a domain record in the shared table
  * @param s pointer to the shared table

native/include/host.h

@@ -40,11 +40,6 @@ struct hostinfo
 };
 typedef struct hostinfo hostinfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Insert(alloc) and update a host record in the shared table
  * @param s pointer to the shared table

native/include/mod_clustersize.h

@@ -15,6 +15,11 @@
 #error "PROXY_WORKER_MAX_ROUTE_SIZE is not defined"
 #endif
 
+/**
+ * Use apache httpd structure
+ */
+typedef struct ap_slotmem_provider_t slotmem_storage_method;
+
 /* For host.h */
 #define HOSTALIASZ  255
 

native/include/node.h

@@ -81,11 +81,6 @@ struct nodeinfo
 };
 typedef struct nodeinfo nodeinfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Return the last stored in the mem structure
  * @param pointer to the shared table

native/include/sessionid.h

@@ -39,11 +39,6 @@ struct sessionidinfo
 };
 typedef struct sessionidinfo sessionidinfo_t;
 
-/**
- * Use apache httpd structure
- */
-typedef struct ap_slotmem_provider_t slotmem_storage_method;
-
 /**
  * Insert(alloc) and update a sessionid record in the shared table
  * @param s pointer to the shared table