[systemd-commits] 2 commits - src/bus-proxyd src/shared

[Tom Gundersen]

 src/bus-proxyd/bus-policy.c |    1 -
 src/shared/path-util.h      |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 4a3bb599609d687e0a501a748bfac491f5fb9f6c
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Sep 25 16:21:36 2014 +0200

    bus-proxy: drop one wrong assert()

diff --git a/src/bus-proxyd/bus-policy.c b/src/bus-proxyd/bus-policy.c
index 0de7680..2ff5d64 100644
--- a/src/bus-proxyd/bus-policy.c
+++ b/src/bus-proxyd/bus-policy.c
@@ -688,7 +688,6 @@ static int check_policy_items(PolicyItem *items, const struct policy_check_filte
         PolicyItem *i;
         int r, ret = DUNNO;
 
-        assert(items);
         assert(filter);
 
         /* Check all policies in a set - a broader one might be followed by a more specific one,

commit 4a690c47260ca507bbcf92e2a68f66d3ec9a23fb
Author: Tom Gundersen <teg at jklm.no>
Date:   Thu Sep 25 16:12:41 2014 +0200

    shared: path-util - try to make PATH_FORECH_PREFIX look less wrong
    
    We replace the idiom "X && !(*foo = 0)" with "X && ((*foo = 0), true)".
    
    This is not a functional change, but should hopefully make it less
    likely that people and static analyzers believe there is a typo here
    (i.e., to make it clear that the intention was not "X && *foo != 0").
    
    Thanks to David Herrmann for the suggestion.

diff --git a/src/shared/path-util.h b/src/shared/path-util.h
index d85291b..8d171a5 100644
--- a/src/shared/path-util.h
+++ b/src/shared/path-util.h
@@ -65,8 +65,8 @@ int fsck_exists(const char *fstype);
  * the tree, to root. Also returns "" (and not "/"!) for the root
  * directory. Excludes the specified directory itself */
 #define PATH_FOREACH_PREFIX(prefix, path) \
-        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); streq(prefix, "/") ? NULL : strrchr(prefix, '/'); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
+        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); streq(prefix, "/") ? NULL : strrchr(prefix, '/'); }); _slash && ((*_slash = 0), true); _slash = strrchr((prefix), '/'))
 
 /* Same as PATH_FOREACH_PREFIX but also includes the specified path itself */
 #define PATH_FOREACH_PREFIX_MORE(prefix, path) \
-        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); if (streq(prefix, "/")) prefix[0] = 0; strrchr(prefix, 0); }); _slash && !(*_slash = 0); _slash = strrchr((prefix), '/'))
+        for (char *_slash = ({ path_kill_slashes(strcpy(prefix, path)); if (streq(prefix, "/")) prefix[0] = 0; strrchr(prefix, 0); }); _slash && ((*_slash = 0), true); _slash = strrchr((prefix), '/'))