On Mon, 03 Nov 2014 09:49:03 +0000 Philip Withnall <[email protected]> wrote:
> It expects ((msg_controllen == 0) == (msg_control == NULL)), and returns > EINVAL otherwise. It can't hurt to be tidy about things on other platforms > either though. > > See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=99356#c5 > > Signed-off-by: Philip Withnall <philip at tecnocode.co.uk> > Signed-off-by: Karsten Otto <ottoka at posteo.de> Please use non-mangled email addresses in the future. I don't think git tools will gracefully de-mangle these for automatic Cc list gathering, do they? > --- > Updated as per Bill Spitzak’s recommendation to make the change more concise. > --- > src/connection.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/connection.c b/src/connection.c > index f292853..1e271c4 100644 > --- a/src/connection.c > +++ b/src/connection.c > @@ -287,7 +287,7 @@ wl_connection_flush(struct wl_connection *connection) > msg.msg_namelen = 0; > msg.msg_iov = iov; > msg.msg_iovlen = count; > - msg.msg_control = cmsg; > + msg.msg_control = (clen > 0) ? cmsg : NULL; > msg.msg_controllen = clen; > msg.msg_flags = 0; > Pushed. Thanks, pq _______________________________________________ wayland-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/wayland-devel
