[systemd-devel] [PATCH] delta: Fix broken separator support

[Tom Gundersen]

Applied. Thanks!

On Sun, Nov 30, 2014 at 12:14 PM,  <alison at she-devel.com> wrote:
> From: Alison Chaiken <alison_chaiken at mentor.com>
>
> systemd-delta man page promises that multiple types of deltas will be
> concatenated if they are listed with a comma as separator.  Replace
> FOREACH_WORD() with FOREACH_WORD_SEPARATOR() to restore the functionality.
>
> Signed-off-by: Alison Chaiken <alison_chaiken at mentor.com>

We don't do s-o-b, so I dropped this line.

>  src/delta/delta.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/delta/delta.c b/src/delta/delta.c
> index 9930571..a3a121f 100644
> --- a/src/delta/delta.c
> +++ b/src/delta/delta.c
> @@ -484,7 +484,7 @@ static int parse_flags(const char *flag_str, int flags) {
>          const char *word, *state;
>          size_t l;
>
> -        FOREACH_WORD(word, l, flag_str, state) {
> +        FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) {
>                  if (strneq("masked", word, l))
>                          flags |= SHOW_MASKED;
>                  else if (strneq ("equivalent", word, l))
> --
> 2.1.3
>
> _______________________________________________
> systemd-devel mailing list
> systemd-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/systemd-devel