Skip to content

Commit

Permalink
modpost: minor cleanup.
Browse files Browse the repository at this point in the history
We want a strends() function next, so make one and use it appropriately,
making new_module() arg const while we're at it.

Signed-off-by: Rusty Russell <[email protected]>
  • Loading branch information
rustyrussell committed Apr 5, 2013
1 parent d70f82a commit d4ef1c3
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <stdio.h>
#include <ctype.h>
#include <string.h>
#include <stdbool.h>
#include "modpost.h"
#include "../../include/generated/autoconf.h"
#include "../../include/linux/license.h"
Expand Down Expand Up @@ -78,6 +79,14 @@ PRINTF void merror(const char *fmt, ...)
va_end(arglist);
}

static inline bool strends(const char *str, const char *postfix)
{
if (strlen(str) < strlen(postfix))
return false;

return strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
}

static int is_vmlinux(const char *modname)
{
const char *myname;
Expand Down Expand Up @@ -113,22 +122,20 @@ static struct module *find_module(char *modname)
return mod;
}

static struct module *new_module(char *modname)
static struct module *new_module(const char *modname)
{
struct module *mod;
char *p, *s;
char *p;

mod = NOFAIL(malloc(sizeof(*mod)));
memset(mod, 0, sizeof(*mod));
p = NOFAIL(strdup(modname));

/* strip trailing .o */
s = strrchr(p, '.');
if (s != NULL)
if (strcmp(s, ".o") == 0) {
*s = '\0';
mod->is_dot_o = 1;
}
if (strends(p, ".o")) {
p[strlen(p) - 2] = '\0';
mod->is_dot_o = 1;
}

/* add to list */
mod->name = p;
Expand Down

0 comments on commit d4ef1c3

Please sign in to comment.