[Dnsmasq-discuss] dnsmasq 2.92test2: Compiler warnings

[Geert Stappers]

On Mon, Apr 14, 2025 at 10:13:34PM +0200, Retransmit wrote:
> On Wed, Apr 9, 2025 at 1:50 PM Opty wrote:
> > [...]
> >
> > Unfortunately Gmail web UI converts tabs to spaces so beware or use
> > <https://termbin.com/ad1l>.
> 
> diff -Naur a/dnsmasq-2.92test2/src/cache.c b/dnsmasq-2.92test2/src/cache.c
> --- a/dnsmasq-2.92test2/src/cache.c	2025-04-04 23:01:51.000000000 +0200
> +++ b/dnsmasq-2.92test2/src/cache.c	2025-04-09 12:10:03.321927534 +0200
> @@ -881,15 +881,15 @@
>  	  /* Sneak in possibly updated crypto HWM. */
>  	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
>  	    return 0;
> -	  if (m > daemon->metrics[METRIC_CRYPTO_HWM])
> +	  if ((unsigned int)m > daemon->metrics[METRIC_CRYPTO_HWM])
>  	    daemon->metrics[METRIC_CRYPTO_HWM] = m;
>  	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
>  	    return 0;
> -	  if (m > daemon->metrics[METRIC_SIG_FAIL_HWM])
> +	  if ((unsigned int)m > daemon->metrics[METRIC_SIG_FAIL_HWM])
>  	    daemon->metrics[METRIC_SIG_FAIL_HWM] = m;
>  	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
>  	    return 0;
> -	  if (m > daemon->metrics[METRIC_WORK_HWM])
> +	  if ((unsigned int)m > daemon->metrics[METRIC_WORK_HWM])
>  	    daemon->metrics[METRIC_WORK_HWM] = m;
>  #endif
>  	  cache_end_insert();

For your information and for the mailinglist archive:

$ git log --diff | head -n 24
commit 942a35f5177746d2080e7aa118dd1493a500e2d5
Author: Opty <opty77 at gmail.com>
Date:   Wed Apr 16 16:00:47 2025 +0100

    Silence compiler warnings.

diff --git a/src/cache.c b/src/cache.c
index 2fca17c..682ee92 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -881,15 +881,15 @@ int cache_recv_insert(time_t now, int fd)
 	  /* Sneak in possibly updated crypto HWM. */
 	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
 	    return 0;
-	  if (m > daemon->metrics[METRIC_CRYPTO_HWM])
+	  if ((unsigned int)m > daemon->metrics[METRIC_CRYPTO_HWM])
 	    daemon->metrics[METRIC_CRYPTO_HWM] = m;
 	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
 	    return 0;
-	  if (m > daemon->metrics[METRIC_SIG_FAIL_HWM])
+	  if ((unsigned int)m > daemon->metrics[METRIC_SIG_FAIL_HWM])
 	    daemon->metrics[METRIC_SIG_FAIL_HWM] = m;
 	  if (!read_write(fd, (unsigned char *)&m, sizeof(m), RW_READ))
 	    return 0;