projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2e3bb01
)
journal: remove unnecessary HAVE_PCRE2 check
author
Quentin Deslandes
<qdeslandes@naccy.de>
Mon, 25 Jul 2022 13:53:12 +0000
(15:53 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 3 Aug 2022 16:44:44 +0000
(18:44 +0200)
Since HAVE_PCRE2 checks are performed in pcre2-util.c, there is no
need for this extra check in journalctl.c.
src/journal/journalctl.c
patch
|
blob
|
history
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index 5cc92b5f36d03505b1e12c5ac24fe55e325ecf44..f7b018f37b0870297632c2fc6055b76f84872fd2 100644
(file)
--- 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;
}