On Sat, Aug 24, 2013 at 12:24:59PM +0000, Andre Oppermann wrote: > Author: andre > Date: Sat Aug 24 12:24:58 2013 > New Revision: 254779 > URL: http://svnweb.freebsd.org/changeset/base/254779 > > Log: > Avoid code duplication for mbuf initialization and use m_init() instead > in mb_ctor_mbuf() and mb_ctor_pack(). > > Modified: > head/sys/kern/kern_mbuf.c >
> [...] > -#ifdef MAC > - /* If the label init fails, fail the alloc */ > - error = mac_mbuf_init(m, how); > - if (error) > - return (error); > -#endif > - } else > - m->m_data = m->m_dat; > - return (0); > + m = (struct mbuf *)mem; > + flags = args->flags; > + > + error = m_init(m, NULL, size, how, type, flags); > + > + return (error); > } > This breaks head/. cc -c -O -pipe -std=c99 -g -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions -Wmissing-include-dirs -fdiagnostics-show-option -Wno-error-tautological-compare -Wno-error-empty-body -Wno-error-parentheses-equality -nostdinc -I. -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -funwind-tables -mllvm -arm-enable-ehabi -ffreestanding -Werror /src/sys/kern/kern_mbuf.c /src/sys/kern/kern_mbuf.c:637:2: error: use of undeclared identifier 'error' error = m_init(m, NULL, size, how, type, flags); ^ /src/sys/kern/kern_mbuf.c:643:10: error: use of undeclared identifier 'error' return (error); ^ http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-armv6-arm.full Glen
pgpWbopOXqBhq.pgp
Description: PGP signature