Skip to content

Commit

Permalink
kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c
Browse files Browse the repository at this point in the history
The only in-kernel user of "memmem" is scripts/kallsyms.c and it only
uses it to find tokens that are 2 bytes in size. It is trivial to
replace it with a simple function that finds 2-byte tokens.

This should help users from systems that don't have the memmem GNU
extension available.

Signed-off-by: Paulo Marques <pmarques@grupopie.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Paulo Marques authored and sravnborg committed Jul 17, 2007
1 parent af332aa commit 7c5d249
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions scripts/kallsyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
*
*/

#define _GNU_SOURCE

#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Expand Down Expand Up @@ -378,6 +376,17 @@ static void build_initial_tok_table(void)
table_cnt = pos;
}

static void *find_token(unsigned char *str, int len, unsigned char *token)
{
int i;

for (i = 0; i < len - 1; i++) {
if (str[i] == token[0] && str[i+1] == token[1])
return &str[i];
}
return NULL;
}

/* replace a given token in all the valid symbols. Use the sampled symbols
* to update the counts */
static void compress_symbols(unsigned char *str, int idx)
Expand All @@ -391,7 +400,7 @@ static void compress_symbols(unsigned char *str, int idx)
p1 = table[i].sym;

/* find the token on the symbol */
p2 = memmem(p1, len, str, 2);
p2 = find_token(p1, len, str);
if (!p2) continue;

/* decrease the counts for this symbol's tokens */
Expand All @@ -410,7 +419,7 @@ static void compress_symbols(unsigned char *str, int idx)
if (size < 2) break;

/* find the token on the symbol */
p2 = memmem(p1, size, str, 2);
p2 = find_token(p1, size, str);

} while (p2);

Expand Down

0 comments on commit 7c5d249

Please sign in to comment.