summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-10-12 09:45:58 +0200
committerDaniel Mack <github@zonque.org>2015-10-12 09:45:58 +0200
commit09ba85f55775733f62a695fdbce9b63c67d58a8d (patch)
tree5e66074c7fbbf540bd56bb157d17792fcd094466
parent0a41d91f3022ae5107151ebd1af9b65a55030c7e (diff)
parent2366ab3026fc3a52dee17bba1b3a60eaa655c2eb (diff)
Merge pull request #1532 from phomes/trivial-fixes
Trivial fixes
-rw-r--r--src/rfkill/rfkill.c4
-rw-r--r--src/shared/fstab-util.c1
2 files changed, 2 insertions, 3 deletions
diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index d8a2f3694e..72c9eb4446 100644
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -40,8 +40,8 @@ static const char* const rfkill_type_table[NUM_RFKILL_TYPES] = {
[RFKILL_TYPE_WIMAX] = "wimax",
[RFKILL_TYPE_WWAN] = "wwan",
[RFKILL_TYPE_GPS] = "gps",
- [RFKILL_TYPE_FM] "fm",
- [RFKILL_TYPE_NFC] "nfc",
+ [RFKILL_TYPE_FM] = "fm",
+ [RFKILL_TYPE_NFC] = "nfc",
};
DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(rfkill_type, int);
diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
index db2146f8c1..c065adcfdf 100644
--- a/src/shared/fstab-util.c
+++ b/src/shared/fstab-util.c
@@ -25,7 +25,6 @@
#include "util.h"
bool fstab_is_mount_point(const char *mount) {
- _cleanup_free_ char *device = NULL;
_cleanup_endmntent_ FILE *f = NULL;
struct mntent *m;