diff options
Diffstat (limited to 'debian/patches/0009-Avoid-compiler-warning-about-empty-bodies.patch')
| -rw-r--r-- | debian/patches/0009-Avoid-compiler-warning-about-empty-bodies.patch | 135 |
1 files changed, 135 insertions, 0 deletions
diff --git a/debian/patches/0009-Avoid-compiler-warning-about-empty-bodies.patch b/debian/patches/0009-Avoid-compiler-warning-about-empty-bodies.patch new file mode 100644 index 00000000..322e05f8 --- /dev/null +++ b/debian/patches/0009-Avoid-compiler-warning-about-empty-bodies.patch @@ -0,0 +1,135 @@ +From 63e87438a543b11fa407dc6e705c1416b4c58efe Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Tue, 20 May 2014 16:07:44 +0200 +Subject: [PATCH 09/27] Avoid compiler warning about empty bodies + +Make empty bodies of control flow statements more explicit. Doing so +will allow us to use stricter compiler settings. This would have +cought 4ece292c. + +* console-client/xkb/xkb.c: Make empty bodies more explicit +* libpipe/pipe.c: Likewise. +* mach-defpager/default_pager.c: Likewise. +* pfinet/linux-src/include/net/addrconf.h: Likewise. +* pfinet/linux-src/net/ipv4/fib_hash.c: Likewise. +* pflocal/connq.c: Likewise. +* pflocal/socket.c: Likewise. +--- + console-client/xkb/xkb.c | 3 ++- + libpipe/pipe.c | 4 +++- + mach-defpager/default_pager.c | 4 ++-- + pfinet/linux-src/include/net/addrconf.h | 2 ++ + pfinet/linux-src/net/ipv4/fib_hash.c | 2 +- + pflocal/connq.c | 2 +- + pflocal/socket.c | 4 +++- + 7 files changed, 14 insertions(+), 7 deletions(-) + +diff --git a/console-client/xkb/xkb.c b/console-client/xkb/xkb.c +index 0b43913..220701b 100644 +--- a/console-client/xkb/xkb.c ++++ b/console-client/xkb/xkb.c +@@ -606,10 +606,11 @@ clearcontrols (keypress_t key, boolctrls ctrls, int flags) + static void + lockcontrols (keypress_t key, boolctrls ctrls, int flags) + { ++ /* XXX this needs a closer look. */ + if (!key.rel) + { + //setcontrols (key, boolctrls, flags); +- if (!(flags & noLock)); ++ //if (!(flags & noLock)); + // lboolctrls |= boolctrls; + } + else +diff --git a/libpipe/pipe.c b/libpipe/pipe.c +index 1080b5d..f9300e7 100644 +--- a/libpipe/pipe.c ++++ b/libpipe/pipe.c +@@ -352,7 +352,9 @@ pipe_send (struct pipe *pipe, int noblock, void *source, + if (!err) + err = packet_set_ports (control_packet, ports, num_ports); + if (err) +- /* Trash CONTROL_PACKET somehow XXX */; ++ { ++ /* Trash CONTROL_PACKET somehow XXX */ ++ } + } + } + +diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c +index f514ea6..380c724 100644 +--- a/mach-defpager/default_pager.c ++++ b/mach-defpager/default_pager.c +@@ -88,13 +88,13 @@ synchronized_printf (const char *fmt, ...) + #if 0 + #define dprintf(f, x...) synchronized_printf (f, ##x) + #else +-#define dprintf(f, x...) ++#define dprintf(f, x...) (void) 0 + #endif + + #if 0 + #define ddprintf(f, x...) synchronized_printf (f, ##x) + #else +-#define ddprintf(f, x...) ++#define ddprintf(f, x...) (void) 0 + #endif + + /* +diff --git a/pfinet/linux-src/include/net/addrconf.h b/pfinet/linux-src/include/net/addrconf.h +index d711d0d..4b27077 100644 +--- a/pfinet/linux-src/include/net/addrconf.h ++++ b/pfinet/linux-src/include/net/addrconf.h +@@ -1,6 +1,8 @@ + #ifndef _ADDRCONF_H + #define _ADDRCONF_H + ++#include "ipv6.h" ++ + #define RETRANS_TIMER HZ + + #define MAX_RTR_SOLICITATIONS 3 +diff --git a/pfinet/linux-src/net/ipv4/fib_hash.c b/pfinet/linux-src/net/ipv4/fib_hash.c +index d9e029c..e3987ea 100644 +--- a/pfinet/linux-src/net/ipv4/fib_hash.c ++++ b/pfinet/linux-src/net/ipv4/fib_hash.c +@@ -406,7 +406,7 @@ static void rtmsg_fib(int, struct fib_node*, int, int, + struct nlmsghdr *n, + struct netlink_skb_parms *); + #else +-#define rtmsg_fib(a, b, c, d, e, f) ++#define rtmsg_fib(a, b, c, d, e, f) (void) 0 + #endif + + +diff --git a/pflocal/connq.c b/pflocal/connq.c +index d88711e..d86f9a2 100644 +--- a/pflocal/connq.c ++++ b/pflocal/connq.c +@@ -212,7 +212,7 @@ connq_listen (struct connq *cq, struct timespec *tsp, struct sock **sock) + request and another listener (should) eventually come along. + (In fact it is very probably as the caller has likely done a + select and will now follow up with an accept.) */ +- ; ++ { /* Do nothing. */ } + + out: + pthread_mutex_unlock (&cq->lock); +diff --git a/pflocal/socket.c b/pflocal/socket.c +index 7142c6e..792c637 100644 +--- a/pflocal/socket.c ++++ b/pflocal/socket.c +@@ -198,7 +198,9 @@ S_socket_accept (struct sock_user *user, + ports_port_deref (peer_addr); + } + else +- /* TEAR DOWN THE CONNECTION XXX */; ++ { ++ /* TEAR DOWN THE CONNECTION XXX */ ++ } + } + } + +-- +2.0.0.rc2 + |