Re: Build break on port amd64 - recent header changes?

[Paul Goyette <paul%whooppee.com@localhost>]

Looks like rev 1.68 did not completely/correctly back out rev 1.67, and 
incorrectly introduced a new function, in6_gif_pause().

The following patch removes the new function and restores 
in6_gif_detach() to its rev 1.66 condition.  This removes at least one 
build-break ...


Index: in6_gif.c
===================================================================
RCS file: /cvsroot/src/sys/netinet6/in6_gif.c,v
retrieving revision 1.68
diff -u -p -r1.68 in6_gif.c
--- in6_gif.c   22 Jan 2016 23:27:12 -0000      1.68
+++ in6_gif.c   23 Jan 2016 07:20:41 -0000
@@ -385,7 +385,7 @@ in6_gif_attach(struct gif_softc *sc)
 }

 int
-in6_gif_pause(struct gif_softc *sc)
+in6_gif_detach(struct gif_softc *sc)
 {
        int error;

@@ -393,16 +393,9 @@ in6_gif_pause(struct gif_softc *sc)
        if (error == 0)
                sc->encap_cookie6 = NULL;

-       return error;
-}
-
-int
-in6_gif_detach(struct gif_softc *sc)
-{
-
        rtcache_free(&sc->gif_ro);

-       return 0;
+       return error;
 }

 void *



On Sat, 23 Jan 2016, Paul Goyette wrote:

> With sources up-to-the-moment ...
>
> ...
> #   compile  libgif/in6_gif.o
> /build/netbsd-local/tools/x86_64/amd64/bin/x86_64--netbsd-gcc -O2 
> -ffreestanding -fno-strict-aliasing -mno-red-zone -mno-mmx -mno-sse -mno-avx 
> -msoft-float   -std=gnu99    -Wall -Wstrict-prototypes -Wmissing-prototypes 
> -Wpointer-arith -Wno-sign-compare  -Wno-traditional  -Wa,--fatal-warnings 
> -Wreturn-type -Wswitch -Wshadow -Wcast-qual -Wwrite-strings -Wextra 
> -Wno-unused-parameter -Wno-sign-compare -Werror -Wno-format-zero-length 
> -Wno-pointer-sign   -fstack-protector -Wstack-protector   --param 
> ssp-buffer-size=1 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../librump/rumpkern 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../librump/rumpnet 
> --sysroot=/build/netbsd-local/dest/amd64 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 
> -nostdinc -imacros 
> /build/netbsd-local/src/sys/rump/net/lib/libgif/../../../include/opt/opt_rumpkernel.h 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif -I. 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../../../common/include 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../include 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../include/opt 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../../arch 
> -I/build/netbsd-local/src/sys/rump/net/lib/libgif/../../../.. -DDIAGNOSTIC 
> -DKTRACE   -D_FORTIFY_SOURCE=2 -c 
> /build/netbsd-local/src/sys/rump/net/lib/libgif/../../../../netinet6/in6_gif.c 
> -o in6_gif.o
> /build/netbsd-local/src/sys/rump/net/lib/libgif/../../../../netinet6/in6_gif.c:388:1: 
> error: no previous prototype for 'in6_gif_pause' [-Werror=missing-prototypes]
> in6_gif_pause(struct gif_softc *sc)
> ^
> cc1: all warnings being treated as errors
> *** [in6_gif.o] Error code 1
> ...
>
>
> +------------------+--------------------------+------------------------+
> | Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:      |
> | (Retired)        | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
> | Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
> +------------------+--------------------------+------------------------+

+------------------+--------------------------+------------------------+
| Paul Goyette     | PGP Key fingerprint:     | E-mail addresses:      |
| (Retired)        | FA29 0E3B 35AF E8AE 6651 | paul at whooppee.com   |
| Kernel Developer | 0786 F758 55DE 53BA 7731 | pgoyette at netbsd.org |
+------------------+--------------------------+------------------------+