diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-26 16:49:30 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-26 16:49:30 -0500 |
| commit | b4e69ac670d71b5748dc81e536b2cb103489badd (patch) | |
| tree | 26a04ba5d950657132fd6acb4e0ef17d0bcabe93 /lib | |
| parent | 144ce879b057c760194d808c90826cd96308f423 (diff) | |
| parent | 7cc2edb83447775a34ed3bf9d29d8295a434b523 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/textsearch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/textsearch.c b/lib/textsearch.c index d608331b3e47..e0cc0146ae62 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | * | 13 | * |
| 14 | * INTRODUCTION | 14 | * INTRODUCTION |
| 15 | * | 15 | * |
| 16 | * The textsearch infrastructure provides text searching facitilies for | 16 | * The textsearch infrastructure provides text searching facilities for |
| 17 | * both linear and non-linear data. Individual search algorithms are | 17 | * both linear and non-linear data. Individual search algorithms are |
| 18 | * implemented in modules and chosen by the user. | 18 | * implemented in modules and chosen by the user. |
| 19 | * | 19 | * |
| @@ -43,7 +43,7 @@ | |||
| 43 | * to the algorithm to store persistent variables. | 43 | * to the algorithm to store persistent variables. |
| 44 | * (4) Core eventually resets the search offset and forwards the find() | 44 | * (4) Core eventually resets the search offset and forwards the find() |
| 45 | * request to the algorithm. | 45 | * request to the algorithm. |
| 46 | * (5) Algorithm calls get_next_block() provided by the user continously | 46 | * (5) Algorithm calls get_next_block() provided by the user continuously |
| 47 | * to fetch the data to be searched in block by block. | 47 | * to fetch the data to be searched in block by block. |
| 48 | * (6) Algorithm invokes finish() after the last call to get_next_block | 48 | * (6) Algorithm invokes finish() after the last call to get_next_block |
| 49 | * to clean up any leftovers from get_next_block. (Optional) | 49 | * to clean up any leftovers from get_next_block. (Optional) |
| @@ -58,15 +58,15 @@ | |||
| 58 | * the pattern to look for and flags. As a flag, you can set TS_IGNORECASE | 58 | * the pattern to look for and flags. As a flag, you can set TS_IGNORECASE |
| 59 | * to perform case insensitive matching. But it might slow down | 59 | * to perform case insensitive matching. But it might slow down |
| 60 | * performance of algorithm, so you should use it at own your risk. | 60 | * performance of algorithm, so you should use it at own your risk. |
| 61 | * The returned configuration may then be used for an arbitary | 61 | * The returned configuration may then be used for an arbitrary |
| 62 | * amount of times and even in parallel as long as a separate struct | 62 | * amount of times and even in parallel as long as a separate struct |
| 63 | * ts_state variable is provided to every instance. | 63 | * ts_state variable is provided to every instance. |
| 64 | * | 64 | * |
| 65 | * The actual search is performed by either calling textsearch_find_- | 65 | * The actual search is performed by either calling textsearch_find_- |
| 66 | * continuous() for linear data or by providing an own get_next_block() | 66 | * continuous() for linear data or by providing an own get_next_block() |
| 67 | * implementation and calling textsearch_find(). Both functions return | 67 | * implementation and calling textsearch_find(). Both functions return |
| 68 | * the position of the first occurrence of the patern or UINT_MAX if | 68 | * the position of the first occurrence of the pattern or UINT_MAX if |
| 69 | * no match was found. Subsequent occurences can be found by calling | 69 | * no match was found. Subsequent occurrences can be found by calling |
| 70 | * textsearch_next() regardless of the linearity of the data. | 70 | * textsearch_next() regardless of the linearity of the data. |
| 71 | * | 71 | * |
| 72 | * Once you're done using a configuration it must be given back via | 72 | * Once you're done using a configuration it must be given back via |