summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-05-10 03:34:31 +0200
committerLennart Poettering <lennart@poettering.net>2010-05-10 03:34:31 +0200
commitbab45044482dc012331c768c08d78a2d006485ad (patch)
tree23c288fd5acf57ae58e7e4b9895ad2fb7f95d3cd
parent462b33e96ad1732658b39895eea0b146e98bc3a5 (diff)
make gcc shut up
-rw-r--r--execute.c4
-rw-r--r--mount-setup.c2
-rw-r--r--swap.c3
-rw-r--r--util.c2
4 files changed, 6 insertions, 5 deletions
diff --git a/execute.c b/execute.c
index a7775a4ea9..ef24f71a25 100644
--- a/execute.c
+++ b/execute.c
@@ -392,8 +392,8 @@ static int chown_terminal(int fd, uid_t uid) {
assert(fd >= 0);
/* This might fail. What matters are the results. */
- fchown(fd, uid, -1);
- fchmod(fd, TTY_MODE);
+ (void) fchown(fd, uid, -1);
+ (void) fchmod(fd, TTY_MODE);
if (fstat(fd, &st) < 0)
return -errno;
diff --git a/mount-setup.c b/mount-setup.c
index 1b3d32bb37..cb91e181bf 100644
--- a/mount-setup.c
+++ b/mount-setup.c
@@ -110,7 +110,7 @@ static int mount_cgroup_controllers(void) {
return -ENOENT;
/* Ignore the header line */
- fgets(buf, sizeof(buf), f);
+ (void) fgets(buf, sizeof(buf), f);
for (;;) {
MountPoint p;
diff --git a/swap.c b/swap.c
index 5c161e10ca..fffd0b9239 100644
--- a/swap.c
+++ b/swap.c
@@ -318,7 +318,8 @@ static int swap_load_proc_swaps(Manager *m) {
Meta *meta;
rewind(m->proc_swaps);
- fscanf(m->proc_self_mountinfo, "%*s %*s %*s %*s %*s\n");
+
+ (void) fscanf(m->proc_self_mountinfo, "%*s %*s %*s %*s %*s\n");
for (;;) {
char *dev = NULL, *d;
diff --git a/util.c b/util.c
index 8042214c8f..f5f1b3a45e 100644
--- a/util.c
+++ b/util.c
@@ -1597,7 +1597,7 @@ int flush_fd(int fd) {
}
int acquire_terminal(const char *name, bool fail, bool force) {
- int fd = -1, notify = -1, r, wd;
+ int fd = -1, notify = -1, r, wd = -1;
assert(name);