From: Quentin Deslandes <qdeslandes@naccy.de>
Date: Mon, 25 Jul 2022 13:53:12 +0000 (+0200)
Subject: journal: remove unnecessary HAVE_PCRE2 check
X-Git-Tag: v252-rc1~525
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8beffbac690338dbe67cd733091c2ed1fbf0bb4b;p=thirdparty%2Fsystemd.git

journal: remove unnecessary HAVE_PCRE2 check

Since HAVE_PCRE2 checks are performed in pcre2-util.c, there is no
need for this extra check in journalctl.c.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5cc92b5f36d..f7b018f37b0 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2732,14 +2732,12 @@ int main(int argc, char *argv[]) {
 finish:
         pager_close();
 
-#if HAVE_PCRE2
         if (arg_compiled_pattern && r == 0 && n_shown == 0)
                 /* --grep was used, no error was thrown, but the pattern didn't
                  * match anything. Let's mimic grep's behavior here and return
                  * a non-zero exit code, so journalctl --grep can be used
                  * in scripts and such */
                 r = -ENOENT;
-#endif
 
         return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }