osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Jakub Zawadzki: 

- use Glibc:s  highly optimized memchr()

svn path=/trunk/; revision=32584
This commit is contained in:
Anders Broman 2010-04-28 08:15:20 +00:00
parent 4a711cc74a
commit 1c1142fce6
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
epan/tvbuff.c
View File

@ -954,21 +954,6 @@ fast_ensure_contiguous(tvbuff_t *tvb, const gint offset, const guint length)
return NULL;
}
static const guint8*
guint8_find(const guint8* haystack, const size_t haystacklen, const guint8 needle)
{
const guint8 *b;
int i;
for (b = haystack, i = 0; (guint) i < haystacklen; i++, b++) {
if (*b == needle) {
return b;
}
}
return NULL;
}
static const guint8*
guint8_pbrk(const guint8* haystack, size_t haystacklen, const guint8 *needles, guchar *found_needle)
{
@ -1822,7 +1807,7 @@ tvb_find_guint8(tvbuff_t *tvb, const gint offset, const gint maxlength, const gu
/* If we have real data, perform our search now. */
if (tvb->real_data) {
result = guint8_find(tvb->real_data + abs_offset, limit, needle);
result = memchr(tvb->real_data + abs_offset, needle, limit);
if (result == NULL) {
return -1;
}