[Slirp] [Git][slirp/libslirp][master] 3 commits: .gitlab-ci: add --werror, treat CI build warnings as errors

[Marc-André Lureau]

Marc-André Lureau pushed to branch master at slirp / libslirp


Commits:
a76398b6 by Marc-André Lureau at 2020-03-17T16:56:38+01:00
.gitlab-ci: add --werror, treat CI build warnings as errors

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>

- - - - -
eb200b42 by Marc-André Lureau at 2020-03-17T17:00:18+01:00
Revert "socket: remove need for extra scope_id variable"

Oops, it turns out the variable is there for portability reasons.

This reverts commit d65f3030a82743bf506b0611a6a1a0358ea5d52b.

Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>

- - - - -
7012a2c6 by Marc-André Lureau at 2020-03-17T17:55:18+00:00
Merge branch 'mingw-fix' into 'master'

Fix mingw scope-id warning

See merge request slirp/libslirp!35
- - - - -


2 changed files:

- .gitlab-ci.yml
- src/socket.c


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -11,14 +11,14 @@ before_script:
 
 build:
   script:
-    - meson build || (cat build/meson-logs/meson-log.txt && exit 1)
+    - meson --werror build || (cat build/meson-logs/meson-log.txt && exit 1)
     - ninja -C build
     - (cd build && meson test) || (cat build/meson-logs/testlog.txt && exit 1)
     - ninja -C build scan-build
 
 build-mingw64:
   script:
-    - (mkdir buildw && cd buildw && mingw64-meson) || (cat buildw/meson-logs/meson-log.txt && exit 1)
+    - (mkdir buildw && cd buildw && mingw64-meson --werror) || (cat buildw/meson-logs/meson-log.txt && exit 1)
     - ninja -C buildw
 
 build-qemu:


=====================================
src/socket.c
=====================================
@@ -840,7 +840,12 @@ static bool sotranslate_out4(Slirp *s, struct socket *so, struct sockaddr_in *si
 static bool sotranslate_out6(Slirp *s, struct socket *so, struct sockaddr_in6 *sin)
 {
     if (in6_equal(&so->so_faddr6, &s->vnameserver_addr6)) {
-        return get_dns6_addr(&sin->sin6_addr, &sin->sin6_scope_id) >= 0;
+        uint32_t scope_id;
+        if (get_dns6_addr(&sin->sin6_addr, &scope_id) >= 0) {
+            sin->sin6_scope_id = scope_id;
+            return true;
+        }
+        return false;
     }
 
     if (in6_equal_net(&so->so_faddr6, &s->vprefix_addr6, s->vprefix_len) ||



View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/3f8f6826ac012f82a7c80beccc0240eac053f403...7012a2c62e5b54eab88c119383022ec7ce86e9b2

-- 
View it on GitLab: https://gitlab.freedesktop.org/slirp/libslirp/-/compare/3f8f6826ac012f82a7c80beccc0240eac053f403...7012a2c62e5b54eab88c119383022ec7ce86e9b2
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/slirp/attachments/20200317/fbc0d487/attachment-0001.htm>