Attachment 238585 Details for Bug 268209 – sysutils/pftop: fix build with clang 15

[patch] sysutils/pftop: fix build with clang 15

sysutils__pftop-fix-clang15-build-1.diff (text/plain), 1.23 KB, created by Dimitry Andric on 2022-12-06 21:14:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-12-06 21:14:42 UTC

Size: 1.23 KB

patch

obsolete

>commit 80470e64be81777372daff2f84b28eb035c61b73
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Tue Dec 6 22:11:37 2022 +0100
>
>    During an exp-run for llvm 15 (see bug 265425), it turned out that
>    sysutils/pftop failed to build with clang 15:
>    
>        pftop.c:1656:28: error: incompatible pointer to integer conversion
>        passing 'counter_u64_t' (aka 'unsigned long *') to parameter of type
>        'u_int64_t' (aka 'unsigned long'); dereference with * [-Wint-conversion]
>                print_fld_size(FLD_STATS, pr->states_tot);
>                                          ^~~~~~~~~~~~~~
>                                          *
>    
>    Indeed, the states_tot field is a pointer, and must be derefenced first.
>
>diff --git a/sysutils/pftop/files/extra-patch-pftop.c b/sysutils/pftop/files/extra-patch-pftop.c
>index 0ce7c8ffd2b4..e22198745b33 100644
>--- a/sysutils/pftop/files/extra-patch-pftop.c
>+++ b/sysutils/pftop/files/extra-patch-pftop.c
>@@ -343,7 +343,7 @@ $OpenBSD: patch-pftop_c,v 1.12 2009/12/02 21:16:10 sthen Exp $
>  #endif
>  #ifdef HAVE_RULE_STATES
> +#ifdef HAVE_PFSYNC_KEY
>-+	print_fld_size(FLD_STATS, pr->states_tot);
>++	print_fld_size(FLD_STATS, *pr->states_tot);
> +#else
>  	print_fld_size(FLD_STATS, pr->states);
>  #endif

Actions: View | Diff

Attachments on bug 268209: 238585