aboutsummaryrefslogtreecommitdiff
path: root/pattern.c
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2021-01-26 17:54:23 -0800
committerBruce Hill <bruce@bruce-hill.com>2021-01-26 17:54:23 -0800
commitde0fec8fcb2e09500b4665b07fdad6a2902d9c87 (patch)
tree19f45a18380bf8ee8f252b8ec49e5068332850b9 /pattern.c
parentd9cca805a005a0c64252ec47674d68a07ded86e5 (diff)
Removed check() and replaced with err()/errx()
Diffstat (limited to 'pattern.c')
-rw-r--r--pattern.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/pattern.c b/pattern.c
index ff9841f..5ecd774 100644
--- a/pattern.c
+++ b/pattern.c
@@ -3,6 +3,7 @@
//
#include <ctype.h>
+#include <err.h>
#include <stdbool.h>
#include <stdlib.h>
#include <string.h>
@@ -180,7 +181,8 @@ static pat_t *bp_simplepattern(file_t *f, const char *str)
pat_t *pat = _bp_simplepattern(f, str);
if (pat == NULL) return pat;
- check(pat->end != NULL, "pat->end is uninitialized!");
+ if (pat->end == NULL)
+ errx(EXIT_FAILURE, "pat->end is uninitialized!");
// Expand postfix operators (if any)
str = after_spaces(pat->end);
@@ -503,7 +505,8 @@ pat_t *bp_stringpattern(file_t *f, const char *str)
// etc.) or \\, then check for an interpolated value:
if (e != str[1] || e == '\\' || e == 'N') {
interp = bp_simplepattern(f, str);
- check(interp, "Failed to match pattern %.*s", 2, str);
+ if (!interp)
+ errx(EXIT_FAILURE, "Failed to match pattern %.*s", 2, str);
break;
} else {
interp = bp_simplepattern(f, str + 1);