projects
/
selector.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8d9de92
)
Cosmetics (matcher_t -> struct matcher).
author
Francois Fleuret
<francois@fleuret.org>
Wed, 13 Apr 2011 07:00:35 +0000
(09:00 +0200)
committer
Francois Fleuret
<francois@fleuret.org>
Wed, 13 Apr 2011 07:00:35 +0000
(09:00 +0200)
selector.c
patch
|
blob
|
history
diff --git
a/selector.c
b/selector.c
index
3b68b47
..
9be758a
100644
(file)
--- a/
selector.c
+++ b/
selector.c
@@
-302,15
+302,15
@@
int add_and_get_previous_index(struct hash_table_t *hash_table,
A matcher matches either with a collection of substrings, or with a
regexp */
A matcher matches either with a collection of substrings, or with a
regexp */
-
typedef struct
{
+
struct matcher
{
regex_t preg;
int regexp_error;
int nb_patterns;
int case_sensitive;
char *splitted_patterns, **patterns;
regex_t preg;
int regexp_error;
int nb_patterns;
int case_sensitive;
char *splitted_patterns, **patterns;
-}
matcher_t
;
+};
-int match(
matcher_t
*matcher, char *string) {
+int match(
struct matcher
*matcher, char *string) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
@@
-348,7
+348,7
@@
int match(matcher_t *matcher, char *string) {
}
}
}
}
-void free_matcher(
matcher_t
*matcher) {
+void free_matcher(
struct matcher
*matcher) {
if(matcher->nb_patterns < 0) {
if(!matcher->regexp_error) regfree(&matcher->preg);
} else {
if(matcher->nb_patterns < 0) {
if(!matcher->regexp_error) regfree(&matcher->preg);
} else {
@@
-357,7
+357,7
@@
void free_matcher(matcher_t *matcher) {
}
}
}
}
-void initialize_matcher(
matcher_t
*matcher,
+void initialize_matcher(
struct matcher
*matcher,
int use_regexp, int case_sensitive,
const char *pattern) {
const char *s;
int use_regexp, int case_sensitive,
const char *pattern) {
const char *s;
@@
-460,14
+460,14
@@
void kill_after_cursor(char *buffer, int *position) {
/*********************************************************************/
/*********************************************************************/
-int previous_visible(int current_line, char **lines,
matcher_t
*matcher) {
+int previous_visible(int current_line, char **lines,
struct matcher
*matcher) {
int line = current_line - 1;
while(line >= 0 && !match(matcher, lines[line])) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
int line = current_line - 1;
while(line >= 0 && !match(matcher, lines[line])) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
-
matcher_t
*matcher) {
+
struct matcher
*matcher) {
int line = current_line + 1;
while(line < nb_lines && !match(matcher, lines[line])) line++;
int line = current_line + 1;
while(line < nb_lines && !match(matcher, lines[line])) line++;
@@
-498,7
+498,7
@@
void update_screen(int *current_focus_line, int *displayed_focus_line,
char *pattern) {
char buffer[BUFFER_SIZE];
char *pattern) {
char buffer[BUFFER_SIZE];
-
matcher_t
matcher;
+
struct matcher
matcher;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;