summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@suse.com>2012-02-29 14:42:49 +0100
committerLennart Poettering <lennart@poettering.net>2012-03-05 15:07:14 +0100
commit6a39419fe4e4ab7beb2412b6a52b5fd513509452 (patch)
tree11943a797fb6969ddc76102ae12d095f2b878060
parent7be3aa1732f76245b58f8cdfe74707f8f7f67d18 (diff)
fix sparse warnings
-rw-r--r--src/getty-generator.c2
-rw-r--r--src/hashmap.c4
-rw-r--r--src/log.c4
-rw-r--r--src/macro.h1
-rw-r--r--src/mount.c2
-rw-r--r--src/util.c4
6 files changed, 9 insertions, 8 deletions
diff --git a/src/getty-generator.c b/src/getty-generator.c
index 1263785fb5..7fac43a0ba 100644
--- a/src/getty-generator.c
+++ b/src/getty-generator.c
@@ -28,7 +28,7 @@
#include "unit-name.h"
#include "virt.h"
-const char *arg_dest = "/tmp";
+static const char *arg_dest = "/tmp";
static int add_symlink(const char *fservice, const char *tservice) {
char *from = NULL, *to = NULL;
diff --git a/src/hashmap.c b/src/hashmap.c
index 7ef809746d..6928118615 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -55,10 +55,10 @@ struct pool {
unsigned n_used;
};
-struct pool *first_hashmap_pool = NULL;
+static struct pool *first_hashmap_pool = NULL;
static void *first_hashmap_tile = NULL;
-struct pool *first_entry_pool = NULL;
+static struct pool *first_entry_pool = NULL;
static void *first_entry_tile = NULL;
static void* allocate_tile(struct pool **first_pool, void **first_tile, size_t tile_size) {
diff --git a/src/log.c b/src/log.c
index c37ab22640..e1f511cca6 100644
--- a/src/log.c
+++ b/src/log.c
@@ -625,11 +625,11 @@ _noreturn_ static void log_assert(const char *text, const char *file, int line,
}
#pragma GCC diagnostic pop
-void log_assert_failed(const char *text, const char *file, int line, const char *func) {
+_noreturn_ void log_assert_failed(const char *text, const char *file, int line, const char *func) {
log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");
}
-void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
+_noreturn_ void log_assert_failed_unreachable(const char *text, const char *file, int line, const char *func) {
log_assert(text, file, line, func, "Code should not be reached '%s' at %s:%u, function %s(). Aborting.");
}
diff --git a/src/macro.h b/src/macro.h
index 58de001f26..19f259e4f1 100644
--- a/src/macro.h
+++ b/src/macro.h
@@ -23,6 +23,7 @@
***/
#include <assert.h>
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <inttypes.h>
diff --git a/src/mount.c b/src/mount.c
index 0ae964b648..f80fcf5f4a 100644
--- a/src/mount.c
+++ b/src/mount.c
@@ -271,7 +271,7 @@ static char* mount_test_option(const char *haystack, const char *needle) {
* struct mntent */
if (!haystack)
- return false;
+ return NULL;
zero(me);
me.mnt_opts = (char*) haystack;
diff --git a/src/util.c b/src/util.c
index e9869ea4fa..bf22f575c7 100644
--- a/src/util.c
+++ b/src/util.c
@@ -892,7 +892,7 @@ int load_env_file(
char ***rl) {
FILE *f;
- char **m = 0;
+ char **m = NULL;
int r;
assert(fname);
@@ -4177,7 +4177,7 @@ int wait_for_terminate_and_warn(const char *name, pid_t pid) {
}
-void freeze(void) {
+_noreturn_ void freeze(void) {
/* Make sure nobody waits for us on a socket anymore */
close_all_fds(NULL, 0);