[systemd-commits] Makefile.am src/gpt-auto-generator src/test

[Thomas H.P. Andersen]

 Makefile.am                                 |   22 ++++++++++++----------
 src/gpt-auto-generator/gpt-auto-generator.c |    2 +-
 src/test/test-cgroup-mask.c                 |    3 ++-
 src/test/test-sched-prio.c                  |    3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

New commits:
commit 96115cdfe0241ae9b4e7177cd3874c0a93d00b39
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Tue Dec 10 22:30:46 2013 +0100

    fix scan-build issues
    
    The static analyzer scan-build had a few issues with analysing
    parts of systemd.
    
    gpt-auto-generator.c:
    scan-build could not find blkid.h. Whether it should be blkid.h or
    blkid/blkid.h seems to depend on the version used. We already use
    blkid/blkid.h in udev-builtin-blkid.c so it seems safe to use that
    here too.
    
    Makefile.am:
    Moved some -D's from CFLAGS to CPPFLAGS. I also simplified them a
    bit and got rid of a left over DBUS_CFLAGS.
    
    test-cgroup-mask.c/test-sched-prio.c
    A variable was added to store the replaced TEST_DIR. When wrapped
    in an assert_se TEST_DIR was not replaced in the logged error.
    While not an issue introduced in this patch we might as well fix
    it up while we are here.

diff --git a/Makefile.am b/Makefile.am
index c13956d..19da6ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1349,10 +1349,9 @@ test_cgroup_LDADD = \
 test_cgroup_mask_SOURCES = \
 	src/test/test-cgroup-mask.c
 
-test_cgroup_mask_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
-	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_cgroup_mask_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_cgroup_mask_LDADD = \
 	libsystemd-core.la \
@@ -1416,9 +1415,9 @@ test_watchdog_LDADD = \
 test_sched_prio_SOURCES = \
 	src/test/test-sched-prio.c
 
-test_sched_prio_CFLAGS = \
-	$(AM_CFLAGS) \
-	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_sched_prio_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_sched_prio_LDADD = \
 	libsystemd-core.la \
@@ -3058,8 +3057,8 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
-test_catalog_CFLAGS = \
-	$(AM_CFLAGS) \
+test_catalog_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
 
 test_catalog_LDADD = \
@@ -3317,9 +3316,12 @@ systemd_journal_gatewayd_LDADD = \
 
 systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(MICROHTTPD_CFLAGS)
 
+systemd_journal_gatewayd_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
 dist_systemunit_DATA += \
 	units/systemd-journal-gatewayd.socket
 
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 3cbafa4..017c35d 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -24,7 +24,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/statfs.h>
-#include <blkid.h>
+#include <blkid/blkid.h>
 
 #ifdef HAVE_LINUX_BTRFS_H
 #include <linux/btrfs.h>
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 0f145d6..99c8cee 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -37,9 +37,10 @@ static int test_cgroup_mask(void) {
         FILE *serial = NULL;
         FDSet *fdset = NULL;
         int r;
+        const char *dir = TEST_DIR;
 
         /* Prepare the manager. */
-        assert_se(set_unit_path(TEST_DIR) >= 0);
+        assert_se(set_unit_path(dir) >= 0);
         r = manager_new(SYSTEMD_USER, &m);
         if (r == -EPERM || r == -EACCES) {
                 puts("manager_new: Permission denied. Skipping test.");
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 56e11f8..a4cc3d4 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -31,9 +31,10 @@ int main(int argc, char *argv[]) {
         FILE *serial = NULL;
         FDSet *fdset = NULL;
         int r;
+        const char *dir = TEST_DIR;
 
         /* prepare the test */
-        assert_se(set_unit_path(TEST_DIR) >= 0);
+        assert_se(set_unit_path(dir) >= 0);
         r = manager_new(SYSTEMD_USER, &m);
         if (r == -EPERM || r == -EACCES || r == -EADDRINUSE || r == -EHOSTDOWN) {
                 printf("Skipping test: manager_new: %s", strerror(-r));