[systemd-commits] 2 commits - Makefile.am src/run src/shared

[Zbigniew Jędrzejewski-Szmek]

 Makefile.am            |    2 ++
 src/run/run.c          |    1 +
 src/shared/path-util.c |    2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 046d2bd446815c40abc1ae4309e72a238bc787b4
Author: Marcel Holtmann <marcel at holtmann.org>
Date:   Sat Sep 7 09:25:07 2013 -0700

    build-sys: gpt-auto-generator depends on HAVE_BLKID

diff --git a/Makefile.am b/Makefile.am
index fd38e82..c8283d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1709,6 +1709,7 @@ bin_PROGRAMS += \
 endif
 
 # ------------------------------------------------------------------------------
+if HAVE_BLKID
 systemgenerator_PROGRAMS +=  \
 	systemd-gpt-auto-generator
 
@@ -1725,6 +1726,7 @@ systemd_gpt_auto_generator_LDADD = \
 systemd_gpt_auto_generator_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS)
+endif
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \

commit 4bcc8c3cb57733de6eeb2528a194501fade11e6b
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Sep 9 17:31:10 2013 -0400

    Fix two compiler warnings

diff --git a/src/run/run.c b/src/run/run.c
index da8c788..18a4920 100644
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -28,6 +28,7 @@
 #include "strv.h"
 #include "build.h"
 #include "unit-name.h"
+#include "path-util.h"
 
 static bool arg_scope = false;
 static bool arg_user = false;
diff --git a/src/shared/path-util.c b/src/shared/path-util.c
index 8e108db..45099ee 100644
--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
@@ -456,7 +456,7 @@ int find_binary(const char *name, char **filename) {
                 FOREACH_WORD_SEPARATOR(w, l, path, ":", state) {
                         char *p;
 
-                        if (asprintf(&p, "%.*s/%s", l, w, name) < 0)
+                        if (asprintf(&p, "%.*s/%s", (int) l, w, name) < 0)
                                 return -ENOMEM;
 
                         if (access(p, X_OK) < 0) {