d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use strdup(9) instead of reimplementing it.

Browse Source
This commit is contained in:
Mark Johnston 2013-08-16 03:41:41 +00:00
parent 50dc0db3f0
commit 196f2f42eb
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/kern/kern_linker.c
View File

@ -153,16 +153,6 @@ static int linker_load_module(const char *kldname,
struct mod_depend *verinfo, struct linker_file **lfpp);
static modlist_t modlist_lookup2(const char *name, struct mod_depend *verinfo);
static char *
linker_strdup(const char *str)
{
char *result;
if ((result = malloc((strlen(str) + 1), M_LINKER, M_WAITOK)) != NULL)
strcpy(result, str);
return (result);
}
static void
linker_init(void *arg)
{
@ -577,8 +567,8 @@ linker_make_file(const char *pathname, linker_class_t lc)
lf->refs = 1;
lf->userrefs = 0;
lf->flags = 0;
lf->filename = linker_strdup(filename);
lf->pathname = linker_strdup(pathname);
lf->filename = strdup(filename, M_LINKER);
lf->pathname = strdup(pathname, M_LINKER);
LINKER_GET_NEXT_FILE_ID(lf->id);
lf->ndeps = 0;
lf->deps = NULL;
@ -1918,7 +1908,7 @@ linker_search_kld(const char *name)
/* qualified at all? */
if (strchr(name, '/'))
return (linker_strdup(name));
return (strdup(name, M_LINKER));
/* traverse the linker path */
len = strlen(name);
@ -2011,7 +2001,7 @@ linker_load_module(const char *kldname, const char *modname,
if (modlist_lookup2(modname, verinfo) != NULL)
return (EEXIST);
if (kldname != NULL)
pathname = linker_strdup(kldname);
pathname = strdup(kldname, M_LINKER);
else if (rootvnode == NULL)
pathname = NULL;
else