From 12e643a7dc65cc6d70f6d207867b6db943c6138b Mon Sep 17 00:00:00 2001 From: Jinyang He Date: Fri, 10 Jul 2020 17:11:32 +0800 Subject: kexec-tools: Check callback first in kexec_iomem_for_each_line() In the function kexec_iomem_for_each_line(), it is better to check the callback first, it can return directly if the callback is NULL. Signed-off-by: Jinyang He Signed-off-by: Simon Horman --- kexec/kexec-iomem.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/kexec/kexec-iomem.c b/kexec/kexec-iomem.c index b5b52b1c..d00b6b61 100644 --- a/kexec/kexec-iomem.c +++ b/kexec/kexec-iomem.c @@ -42,6 +42,9 @@ int kexec_iomem_for_each_line(char *match, int count; int nr = 0, ret; + if (!callback) + return nr; + fp = fopen(iomem, "r"); if (!fp) die("Cannot open %s\n", iomem); @@ -53,13 +56,11 @@ int kexec_iomem_for_each_line(char *match, str = line + consumed; size = end - start + 1; if (!match || memcmp(str, match, strlen(match)) == 0) { - if (callback) { - ret = callback(data, nr, str, start, size); - if (ret < 0) - break; - else if (ret == 0) - nr++; - } + ret = callback(data, nr, str, start, size); + if (ret < 0) + break; + else if (ret == 0) + nr++; } } -- cgit 1.2.3-korg