svn commit: r234290 - head/sys/dev/netmap

[Garrett Cooper]

On Apr 14, 2012, at 9:44 AM, Luigi Rizzo wrote:

> Author: luigi
> Date: Sat Apr 14 16:44:18 2012
> New Revision: 234290
> URL: http://svn.freebsd.org/changeset/base/234290
> 
> Log:
>  i prefer this fix for the -Wformat warning (just one cast,
>  all the other variables are already correct for %x).
>  My previous attempt put the cast in the wrong place.
> 
> Modified:
>  head/sys/dev/netmap/netmap_mem2.c
> 
> Modified: head/sys/dev/netmap/netmap_mem2.c
> ==============================================================================
> --- head/sys/dev/netmap/netmap_mem2.c	Sat Apr 14 16:42:17 2012	(r234289)
> +++ head/sys/dev/netmap/netmap_mem2.c	Sat Apr 14 16:44:18 2012	(r234290)
> @@ -161,11 +161,9 @@ netmap_ofstophys(vm_offset_t offset)
> 		return p[i]->lut[offset / p[i]->_objsize].paddr +
> 			offset % p[i]->_objsize;
> 	}
> -	D("invalid ofs 0x%jx out of 0x%jx 0x%jx 0x%jx", (uintmax_t)o,
> -		(uintmax_t)p[0]->_memtotal,
> -		(uintmax_t)(p[0]->_memtotal + p[1]->_memtotal),
> -		(uintmax_t)(p[0]->_memtotal + p[1]->_memtotal +
> -		    p[2]->_memtotal));
> +	D("invalid ofs 0x%x out of 0x%x 0x%x 0x%x", (u_int)o,
> +		p[0]->_memtotal, p[0]->_memtotal + p[1]->_memtotal,
> +		p[0]->_memtotal + p[1]->_memtotal + p[2]->_memtotal);
> 	return 0;	// XXX bad address
> }

	As I mentioned before in private email, wouldn't it make more sense to make `"%x…", (u_int)o` into `%lx…`, o because vm_offset_t is uint32_t on 32-bit archs and uint64_t on 64-bit archs? What's done above truncates the represented value for 64-bit archs.
Thanks!
-Garrett