svn commit: r279934 - head/sys/dev/cxgbe

[Navdeep Parhar]

On 03/12/2015 11:22, Ian Lepore wrote:
> Author: ian
> Date: Thu Mar 12 18:22:20 2015
> New Revision: 279934
> URL: https://svnweb.freebsd.org/changeset/base/279934
>
> Log:
>    Nullterminate strings returned via sysctl.
>
>    PR:		195668
>
> Modified:
>    head/sys/dev/cxgbe/t4_l2t.c
>    head/sys/dev/cxgbe/t4_main.c
>
> Modified: head/sys/dev/cxgbe/t4_l2t.c
> ==============================================================================
> --- head/sys/dev/cxgbe/t4_l2t.c	Thu Mar 12 18:09:39 2015	(r279933)
> +++ head/sys/dev/cxgbe/t4_l2t.c	Thu Mar 12 18:22:20 2015	(r279934)
> @@ -321,6 +321,7 @@ skip:
>   		mtx_unlock(&e->lock);
>   	}
>
> +	sbuf_putc(&sb, 0); /* nullterm */

This breaks the build, please fix.

Here's the relevant snippet from Jenkins:

--- t4_l2t.o ---
<https://jenkins.freebsd.org/job/FreeBSD_HEAD/ws/sys/modules/cxgbe/if_cxgbe/../../../dev/cxgbe/t4_l2t.c>:324:12: 
error: incompatible pointer types passing 'struct sbuf **' to parameter 
of type 'struct sbuf *'; remove & [-Werror,-Wincompatible-pointer-types]
         sbuf_putc(&sb, 0); /* nullterm */
                   ^~~
<https://jenkins.freebsd.org/job/FreeBSD_HEAD/ws/sys/sys/sbuf.h>:77:30: 
note: passing argument to parameter here
int              sbuf_putc(struct sbuf *, int);
                                         ^
1 error generated.
*** [t4_l2t.o] Error code 1