convert: put the flags field before the flag itself for consistent style
Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lars Schneider committed
Jun 28, 2017 at 23:29 UTC
42b0a86c0ed90d48c2df510e3b26b9bd007ec0a4
1 file changed
+5
-5
convert.c
+5
-5
@@ -597,12 +597,12 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
597
}
598
process = &entry->subprocess.process;
599
600
- if (!(wanted_capability & entry->supported_capabilities))
600
+ if (!(entry->supported_capabilities & wanted_capability))
601
return 0;
602
603
- if (CAP_CLEAN & wanted_capability)
603
+ if (wanted_capability & CAP_CLEAN)
604
filter_type = "clean";
605
- else if (CAP_SMUDGE & wanted_capability)
605
+ else if (wanted_capability & CAP_SMUDGE)
606
filter_type = "smudge";
607
else
608
die("unexpected filter type");
@@ -703,9 +703,9 @@ static int apply_filter(const char *path, const char *src, size_t len,
703
if (!dst)
704
return 1;
705
706
- if ((CAP_CLEAN & wanted_capability) && !drv->process && drv->clean)
706
+ if ((wanted_capability & CAP_CLEAN) && !drv->process && drv->clean)
707
cmd = drv->clean;
708
- else if ((CAP_SMUDGE & wanted_capability) && !drv->process && drv->smudge)
708
+ else if ((wanted_capability & CAP_SMUDGE) && !drv->process && drv->smudge)
709
cmd = drv->smudge;
710
711
if (cmd && *cmd)