projects / dnsmasq.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ebef27f)
Remove compiler warnings for obscure combinations of build options. rfc7440 origin/rfc7440 v2.92test10
authorSimon Kelley <simon@thekelleys.org.uk>
Sat, 24 May 2025 14:09:53 +0000 (15:09 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Sat, 24 May 2025 14:09:53 +0000 (15:09 +0100)
src/dnsmasq.c patch | blob | history
src/inotify.c patch | blob | history
src/network.c patch | blob | history
src/ubus.c patch | blob | history

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index ebb38ad..4c70236 100644 (file)
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -64,14 +64,16 @@ int main (int argc, char **argv)
   int need_cap_net_raw = 0;
   int need_cap_net_bind_service = 0;
   int have_cap_chown = 0;
+#  ifdef HAVE_DHCP
   char *bound_device = NULL;
   int did_bind = 0;
+#  endif
   struct server *serv;
   char *netlink_warn;
 #else
   int bind_fallback = 0;
 #endif 
-#if defined(HAVE_DHCP) || defined(HAVE_DHCP6)
+#if defined(HAVE_DHCP)
   struct dhcp_context *context;
   struct dhcp_relay *relay;
 #endif
@@ -79,6 +81,8 @@ int main (int argc, char **argv)
   int tftp_prefix_missing = 0;
 #endif
 
+  (void)netlink_warn;
+  
 #if defined(HAVE_IDN) || defined(HAVE_LIBIDN2) || defined(LOCALEDIR)
   setlocale(LC_ALL, "");
 #endif
diff --git a/src/inotify.c b/src/inotify.c
index 07e1067..8f07a98 100644 (file)
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -251,6 +251,8 @@ int inotify_check(time_t now)
   int hit = 0;
   struct dyndir *dd;
 
+  (void)now;
+  
   while (1)
     {
       int rc;
diff --git a/src/network.c b/src/network.c
index 68bc273..fd602f8 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -1568,6 +1568,8 @@ void check_servers(int no_loop_check)
   struct serverfd *sfd, *tmp, **up;
   int port = 0, count;
   int locals = 0;
+
+  (void)no_loop_check;
   
 #ifdef HAVE_LOOP
   if (!no_loop_check)
@@ -1775,8 +1777,10 @@ int reload_servers(char *fname)
 /* Called when addresses are added or deleted from an interface */
 void newaddress(time_t now)
 {
+#ifdef HAVE_DHCP
   struct dhcp_relay *relay;
-
+#endif
+  
   (void)now;
   
   if (option_bool(OPT_CLEVERBIND) || option_bool(OPT_LOCAL_SERVICE) ||
diff --git a/src/ubus.c b/src/ubus.c
index 62ddff0..b30f2b6 100644 (file)
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -213,6 +213,11 @@ static int ubus_handle_set_connmark_allowlist(struct ubus_context *ctx, struct u
   size_t num_patterns = 0;
   struct blob_attr *tb[policy_len];
   struct blob_attr *attr;
+
+  (void)ctx;
+  (void)obj;
+  (void)req;
+  (void)method;
   
   if (blobmsg_parse(policy, policy_len, tb, blob_data(msg), blob_len(msg)))
     return UBUS_STATUS_INVALID_ARGUMENT;
Dnsmasq DNS proxy and DHCP server.