lkml.org 
[lkml]   [2007]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 30/33] kallsyms: remove usage of memmem and _GNU_SOURCE from scripts/kallsyms.c
    Date
    From: Paulo Marques <pmarques@grupopie.com>

    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>
    ---
    scripts/kallsyms.c | 17 +++++++++++++----
    1 files changed, 13 insertions(+), 4 deletions(-)

    diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
    index 8b809b2..caf4c86 100644
    --- a/scripts/kallsyms.c
    +++ b/scripts/kallsyms.c
    @@ -24,8 +24,6 @@
    *
    */

    -#define _GNU_SOURCE
    -
    #include <stdio.h>
    #include <stdlib.h>
    #include <string.h>
    @@ -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)
    @@ -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 */
    @@ -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);

    --
    1.5.0.6
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-17 16:21    [W:0.021 / U:29.836 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site