aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Move selection of string searching function out of the loop by using a

Browse Source 
function pointer.


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4777 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2008-03-28 12:42:27 +00:00 committed by exg
parent be3818930a
commit 3dcfe43579
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fe-text/textbuffer.c
View File

@ -512,6 +512,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
GList *matches; GList *matches;
GString *str; GString *str;
int i, match_after, line_matched; int i, match_after, line_matched;
char * (*match_func)(const char *, const char *);
g_return_val_if_fail(buffer != NULL, NULL); g_return_val_if_fail(buffer != NULL, NULL);
g_return_val_if_fail(text != NULL, NULL); g_return_val_if_fail(text != NULL, NULL);
@ -532,6 +533,11 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
line = startline != NULL ? startline : buffer->first_line; line = startline != NULL ? startline : buffer->first_line;
if (fullword)
match_func = case_sensitive ? strstr_full : stristr_full;
else
match_func = case_sensitive ? strstr : stristr;
for (; line != NULL; line = line->next) { for (; line != NULL; line = line->next) {
line_matched = (line->info.level & level) != 0 && line_matched = (line->info.level & level) != 0 &&
(line->info.level & nolevel) == 0; (line->info.level & nolevel) == 0;
@ -544,9 +550,7 @@ GList *textbuffer_find_text(TEXT_BUFFER_REC *buffer, LINE_REC *startline,
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
regexp ? regexec(&preg, str->str, 0, NULL, 0) == 0 : regexp ? regexec(&preg, str->str, 0, NULL, 0) == 0 :
#endif #endif
fullword ? strstr_full_case(str->str, text, !case_sensitive) != NULL : match_func(str->str, text) != NULL;
case_sensitive ? strstr(str->str, text) != NULL :
stristr(str->str, text) != NULL;
} }
if (line_matched) { if (line_matched) {