On Tue, Oct 04, 2016 at 12:19:54AM -0700, Steve Langasek wrote: > Package: nfstrace > Followup-For: Bug #835644 > User: ubuntu-de...@lists.ubuntu.com > Usertags: origin-ubuntu yakkety ubuntu-patch
> I can confirm this bug, as a result of nfstrace building with -Wall -Werror > and gcc6 having new warnings. I've verified that the warning is a false > positive, and have applied the attached patch in Ubuntu to fix the > indentation to make the compiler happy. Please consider applying it in > Debian as well. Well, except that patch is incomplete. Here is an updated patch. Thanks, -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer http://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
Author: Steve Langasek <steve.langa...@canonical.com> Description: Fix FTBFS with gcc6. GCC 6 has gotten extraordinarily pedantic, to the point that -Wall -Werror will fail if indentation is inconsistent. Straighten out our indentation to let GCC 6 pass. Bug-Debian: http://bugs.debian.org/835644 Index: nfstrace-0.4.2/src/protocols/nfs/nfs_procedure.h =================================================================== --- nfstrace-0.4.2.orig/src/protocols/nfs/nfs_procedure.h +++ nfstrace-0.4.2/src/protocols/nfs/nfs_procedure.h @@ -109,9 +109,9 @@ inline ~NFSProcedure() { if(pres) xdr_free((xdrproc_t)proc_t_of(res), (char*)&res ); - xdr_free((xdrproc_t)xdr_replymsg, (char*)&reply); - xdr_free((xdrproc_t)proc_t_of(arg), (char*)&arg ); - xdr_free((xdrproc_t)xdr_callmsg, (char*)&call ); + xdr_free((xdrproc_t)xdr_replymsg, (char*)&reply); + xdr_free((xdrproc_t)proc_t_of(arg), (char*)&arg ); + xdr_free((xdrproc_t)xdr_callmsg, (char*)&call ); } // pointers to procedure specific argument and result Index: nfstrace-0.4.2/src/filtration/sessions_hash.h =================================================================== --- nfstrace-0.4.2.orig/src/filtration/sessions_hash.h +++ nfstrace-0.4.2/src/filtration/sessions_hash.h @@ -100,7 +100,7 @@ if(s[1] != d[1]) return (s[1] < d[1]) ? Session::Source : Session::Destination; if(s[2] != d[2]) return (s[2] < d[2]) ? Session::Source : Session::Destination; - return (s[3] < d[3]) ? Session::Source : Session::Destination; + return (s[3] < d[3]) ? Session::Source : Session::Destination; } static inline void copy_ipv6(uint32_t dst[4], const uint8_t src[16])
signature.asc
Description: PGP signature
