nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Change some regex stuff to use config errors

Browse Source
This commit is contained in:
Pasi Kallinen
2017-09-17 13:43:48 +03:00
parent 45401a13bb
commit 5e05cdc570
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/options.c
View File

@@ -1498,12 +1498,7 @@ char *pattern;
if (!regex_compile(pattern, tmp->regex)) { if (!regex_compile(pattern, tmp->regex)) {
static const char *re_error = "MSGTYPE regex error"; static const char *re_error = "MSGTYPE regex error";
if (!iflags.window_inited) config_error_add("%s: %s", re_error, regex_error_desc(tmp->regex));
config_error_add("%s: %s", re_error, regex_error_desc(tmp->regex));
else {
pline("%s: %s", re_error, regex_error_desc(tmp->regex));
wait_synch();
}
regex_free(tmp->regex); regex_free(tmp->regex);
free((genericptr_t) tmp); free((genericptr_t) tmp);
return FALSE; return FALSE;
@@ -1669,11 +1664,7 @@ int c, a;
tmp = (struct menucoloring *) alloc(sizeof (struct menucoloring)); tmp = (struct menucoloring *) alloc(sizeof (struct menucoloring));
tmp->match = regex_init(); tmp->match = regex_init();
if (!regex_compile(str, tmp->match)) { if (!regex_compile(str, tmp->match)) {
if (!iflags.window_inited) config_error_add("%s: %s", re_error, regex_error_desc(tmp->match));
raw_printf("\n%s: %s\n", re_error, regex_error_desc(tmp->match));
else
pline("%s: %s", re_error, regex_error_desc(tmp->match));
wait_synch();
regex_free(tmp->match); regex_free(tmp->match);
free(tmp); free(tmp);
return FALSE; return FALSE;
@@ -4673,6 +4664,7 @@ boolean setinitial, setfromfile;
if (*mtbuf == '\033') if (*mtbuf == '\033')
return TRUE; return TRUE;
if (*mtbuf if (*mtbuf
&& test_regex_pattern(mtbuf, (const char *)0)
&& (mttyp = query_msgtype()) != -1 && (mttyp = query_msgtype()) != -1
&& !msgtype_add(mttyp, mtbuf)) { && !msgtype_add(mttyp, mtbuf)) {
pline("Error adding the message type."); pline("Error adding the message type.");
@@ -5438,20 +5430,14 @@ const char *mapping;
|| (n == 2 && end == '#')) { || (n == 2 && end == '#')) {
grab = FALSE; grab = FALSE;
} else { } else {
if (!iflags.window_inited) config_error_add("%s", APE_syntax_error);
raw_print(APE_syntax_error); /* from options file */
else
pline("%s", APE_syntax_error); /* via 'O' command */
return 0; return 0;
} }
ape = (struct autopickup_exception *) alloc(sizeof *ape); ape = (struct autopickup_exception *) alloc(sizeof *ape);
ape->regex = regex_init(); ape->regex = regex_init();
if (!regex_compile(text, ape->regex)) { if (!regex_compile(text, ape->regex)) {
if (!iflags.window_inited) config_error_add("%s: %s", APE_regex_error, regex_error_desc(ape->regex));
raw_print(APE_regex_error);
else
pline("%s", APE_regex_error);
regex_free(ape->regex); regex_free(ape->regex);
free((genericptr_t) ape); free((genericptr_t) ape);
return 0; return 0;