diff options
| -rw-r--r-- | console-client/xkb/xkb.c | 3 | ||||
| -rw-r--r-- | libpipe/pipe.c | 4 | ||||
| -rw-r--r-- | mach-defpager/default_pager.c | 4 | ||||
| -rw-r--r-- | pfinet/linux-src/net/ipv4/fib_hash.c | 2 | ||||
| -rw-r--r-- | pflocal/connq.c | 2 | ||||
| -rw-r--r-- | pflocal/socket.c | 4 |
6 files changed, 12 insertions, 7 deletions
diff --git a/console-client/xkb/xkb.c b/console-client/xkb/xkb.c index 0b439134..0039714b 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 1080b5d5..f9300e7c 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 f514ea6b..380c7246 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/net/ipv4/fib_hash.c b/pfinet/linux-src/net/ipv4/fib_hash.c index d9e029ce..e3987eac 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 d88711e3..d86f9a24 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 7142c6ef..792c6379 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 */ + } } } |