Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 103326
b: refs/heads/master
c: b9c7967
h: refs/heads/master
v: v3
  • Loading branch information
Joonwoo Park authored and David S. Miller committed Jul 8, 2008
1 parent 7a41d29 commit 9d5638b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 58de7862e61cb71251a25314d1b3d7260af1448a
refs/heads/master: b9c796783151678d08b1ec1ef410685b2515ba51
10 changes: 5 additions & 5 deletions trunk/include/linux/textsearch.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@

struct ts_config;

/**
* TS_AUTOLOAD - Automatically load textsearch modules when needed
*/
#define TS_AUTOLOAD 1
#define TS_AUTOLOAD 1 /* Automatically load textsearch modules when needed */
#define TS_IGNORECASE 2 /* Searches string case insensitively */

/**
* struct ts_state - search state
Expand All @@ -39,7 +37,7 @@ struct ts_state
struct ts_ops
{
const char *name;
struct ts_config * (*init)(const void *, unsigned int, gfp_t);
struct ts_config * (*init)(const void *, unsigned int, gfp_t, int);
unsigned int (*find)(struct ts_config *,
struct ts_state *);
void (*destroy)(struct ts_config *);
Expand All @@ -52,12 +50,14 @@ struct ts_ops
/**
* struct ts_config - search configuration
* @ops: operations of chosen algorithm
* @flags: flags
* @get_next_block: callback to fetch the next block to search in
* @finish: callback to finalize a search
*/
struct ts_config
{
struct ts_ops *ops;
int flags;

/**
* get_next_block - fetch next block of data
Expand Down
14 changes: 8 additions & 6 deletions trunk/lib/textsearch.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@
* USAGE
*
* Before a search can be performed, a configuration must be created
* by calling textsearch_prepare() specyfing the searching algorithm and
* the pattern to look for. The returned configuration may then be used
* for an arbitary amount of times and even in parallel as long as a
* separate struct ts_state variable is provided to every instance.
* by calling textsearch_prepare() specifying the searching algorithm,
* the pattern to look for and flags. As a flag, you can set TS_IGNORECASE
* to perform case insensitive matching. But it might slow down
* performance of algorithm, so you should use it at own your risk.
* The returned configuration may then be used for an arbitary
* amount of times and even in parallel as long as a separate struct
* ts_state variable is provided to every instance.
*
* The actual search is performed by either calling textsearch_find_-
* continuous() for linear data or by providing an own get_next_block()
Expand Down Expand Up @@ -89,7 +92,6 @@
* panic("Oh my god, dancing chickens at %d\n", pos);
*
* textsearch_destroy(conf);
*
* ==========================================================================
*/

Expand Down Expand Up @@ -279,7 +281,7 @@ struct ts_config *textsearch_prepare(const char *algo, const void *pattern,
if (ops == NULL)
goto errout;

conf = ops->init(pattern, len, gfp_mask);
conf = ops->init(pattern, len, gfp_mask, flags);
if (IS_ERR(conf)) {
err = PTR_ERR(conf);
goto errout;
Expand Down

0 comments on commit 9d5638b

Please sign in to comment.