lkml.org 
[lkml]   [2018]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] modpost: file2alias: check prototype of handler
    Date
    Use specific prototype instead of an opaque pointer so that the
    compiler can catch incompatible pointer type.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    ---

    scripts/mod/file2alias.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
    index 7e4aede..a37af7d 100644
    --- a/scripts/mod/file2alias.c
    +++ b/scripts/mod/file2alias.c
    @@ -47,7 +47,7 @@ typedef struct {
    struct devtable {
    const char *device_id; /* name of table, __mod_<name>__*_device_table. */
    unsigned long id_size;
    - void *function;
    + int (*do_entry)(const char *filename, void *symval, char *alias);
    };

    /* Define a variable f that holds the value of field f of struct devid
    @@ -1299,12 +1299,11 @@ static bool sym_is(const char *name, unsigned namelen, const char *symbol)
    static void do_table(void *symval, unsigned long size,
    unsigned long id_size,
    const char *device_id,
    - void *function,
    + int (*do_entry)(const char *filename, void *symval, char *alias),
    struct module *mod)
    {
    unsigned int i;
    char alias[500];
    - int (*do_entry)(const char *, void *entry, char *alias) = function;

    device_id_check(mod->name, device_id, size, id_size, symval);
    /* Leave last one: it's the terminator. */
    @@ -1420,7 +1419,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,

    if (sym_is(name, namelen, p->device_id)) {
    do_table(symval, sym->st_size, p->id_size,
    - p->device_id, p->function, mod);
    + p->device_id, p->do_entry, mod);
    break;
    }
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-11-22 05:30    [W:6.756 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site