[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[hurd] 53/61: Avoid compiler warning about empty bodies
From: |
Samuel Thibault |
Subject: |
[hurd] 53/61: Avoid compiler warning about empty bodies |
Date: |
Tue, 27 May 2014 08:32:14 +0000 |
This is an automated email from the git hooks/post-receive script.
sthibault pushed a commit to branch upstream
in repository hurd.
commit 1333bbbcc18502328cdd78b2aadc526ebd552a77
Author: Justus Winter <address@hidden>
Date: Tue May 20 16:07:44 2014 +0200
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/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/net/ipv4/fib_hash.c | 2 +-
pflocal/connq.c | 2 +-
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 0b43913..0039714 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/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 */
+ }
}
}
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-hurd/hurd.git
- [hurd] 43/61: libihash: fix typo, (continued)
- [hurd] 43/61: libihash: fix typo, Samuel Thibault, 2014/05/27
- [hurd] 56/61: ext2fs: fix diskfs_pager_users, Samuel Thibault, 2014/05/27
- [hurd] 57/61: trans/mtab: fix initialization, Samuel Thibault, 2014/05/27
- [hurd] 55/61: libpager: drop unused fields from struct pager, Samuel Thibault, 2014/05/27
- [hurd] 49/61: libdiskfs: lock-less reference counting for peropen objects, Samuel Thibault, 2014/05/27
- [hurd] 30/61: ext2fs: use two distinct pager buckets for the disk and file pager, Samuel Thibault, 2014/05/27
- [hurd] 45/61: include: add lock-less reference counting primitives, Samuel Thibault, 2014/05/27
- [hurd] 58/61: libdiskfs: fix node leak in the name cache, Samuel Thibault, 2014/05/27
- [hurd] 51/61: pfinet: add missing include, Samuel Thibault, 2014/05/27
- [hurd] 38/61: libihash: use fast binary scaling to determine the load, Samuel Thibault, 2014/05/27
- [hurd] 53/61: Avoid compiler warning about empty bodies,
Samuel Thibault <=
- [hurd] 60/61: libtrivfs: lock-less reference counting for trivfs_peropen objects, Samuel Thibault, 2014/05/27
- [hurd] 59/61: libihash: do not use an integer hash function by default, Samuel Thibault, 2014/05/27
- [hurd] 15/61: Include the MIG-generated server header files, Samuel Thibault, 2014/05/27