[PATCH v2] grep: simplify is_empty_line
From: Seija Kijin <doremylover123@gmail.com>
Signed-off-by: Seija Kijin <doremylover123@gmail.com>
---
grep: simplify is_empty_line
Signed-off-by: Seija Kijin doremylover123@gmail.comPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1418%2FAtariDreams%2FisEmpty-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1418/AtariDreams/isEmpty-v2
Pull-Request: https://github.com/git/git/pull/1418
Range-diff vs v1:
1: 03a97005a67 ! 1: b193c9537de grep: simplify is_empty_line
@@ grep.c: static int fill_textconv_grep(struct repository *r,
static int is_empty_line(const char *bol, const char *eol)
{
- while (bol < eol && isspace(*bol))
-- bol++;
-- return bol == eol;
-+ while (bol < eol)
++ while (bol < eol) {
+ if (!isspace(*bol))
+ return 0;
+ bol++;
+- return bol == eol;
++ }
+ return 1;
}
grep.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c
index 06eed694936..d78ee08da6f 100644
--- a/grep.c
+++ b/grep.c
@@ -1483,9 +1483,12 @@ static int fill_textconv_grep(struct repository *r,
static int is_empty_line(const char *bol, const char *eol)
{
- while (bol < eol && isspace(*bol))
+ while (bol < eol) {
+ if (!isspace(*bol))
+ return 0;
bol++;
- return bol == eol;
+ }
+ return 1;
}
static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int collect_hits)
base-commit: 6bae53b138a1f38d8887f6b46d17661357a1468b
--
gitgitgadget