git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
lib
/
ts_bm.c
diff --git
a/lib/ts_bm.c
b/lib/ts_bm.c
index
0110e44
..
d90822c
100644
(file)
--- a/
lib/ts_bm.c
+++ b/
lib/ts_bm.c
@@
-111,15
+111,14
@@
static int subpattern(u8 *pattern, int i, int j, int g)
return ret;
}
return ret;
}
-static void compute_prefix_tbl(struct ts_bm *bm, const u8 *pattern,
- unsigned int len)
+static void compute_prefix_tbl(struct ts_bm *bm)
{
int i, j, g;
for (i = 0; i < ASIZE; i++)
{
int i, j, g;
for (i = 0; i < ASIZE; i++)
- bm->bad_shift[i] = len;
- for (i = 0; i < len - 1; i++)
- bm->bad_shift[
pattern[i]] =
len - 1 - i;
+ bm->bad_shift[i] =
bm->pat
len;
+ for (i = 0; i <
bm->pat
len - 1; i++)
+ bm->bad_shift[
bm->pattern[i]] = bm->pat
len - 1 - i;
/* Compute the good shift array, used to match reocurrences
* of a subpattern */
/* Compute the good shift array, used to match reocurrences
* of a subpattern */
@@
-150,8
+149,8
@@
static struct ts_config *bm_init(const void *pattern, unsigned int len,
bm = ts_config_priv(conf);
bm->patlen = len;
bm->pattern = (u8 *) bm->good_shift + prefix_tbl_len;
bm = ts_config_priv(conf);
bm->patlen = len;
bm->pattern = (u8 *) bm->good_shift + prefix_tbl_len;
- compute_prefix_tbl(bm, pattern, len);
memcpy(bm->pattern, pattern, len);
memcpy(bm->pattern, pattern, len);
+ compute_prefix_tbl(bm);
return conf;
}
return conf;
}