vincenzopalazzo/kmod
vincenzopalazzo
/
kmod
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Return early on lookup error 

There's no reason to keep looking for options if alias didn't match.
This commit is contained in:
Lucas De Marchi 2011-12-13 10:48:49 -02:00
parent d470db10a3
commit ecd6bcd204
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libkmod/libkmod.c
View File

@ -660,30 +660,30 @@ KMOD_EXPORT int kmod_resolve_alias_options(struct kmod_ctx *ctx,
if (alias_normalize(given_alias, alias, NULL) < 0)
return -EINVAL;
err = kmod_module_new_from_lookup(ctx, alias, &modules);
if (err >= 0) {
kmod_list_foreach(l, modules) {
const char *str = kmod_module_get_options(l->data);
size_t len;
void *tmp;
if (err < 0)
return err;
if (str == NULL)
continue;
len = strlen(str);
kmod_list_foreach(l, modules) {
const char *str = kmod_module_get_options(l->data);
size_t len;
void *tmp;
tmp = realloc(opts, optslen + len + 2);
if (tmp == NULL)
goto failed;
opts = tmp;
if (optslen > 0) {
opts[optslen] = ' ';
optslen++;
}
memcpy(opts + optslen, str, len);
optslen += len;
opts[optslen] = '\0';
if (str == NULL)
continue;
len = strlen(str);
tmp = realloc(opts, optslen + len + 2);
if (tmp == NULL)
goto failed;
opts = tmp;
if (optslen > 0) {
opts[optslen] = ' ';
optslen++;
}
memcpy(opts + optslen, str, len);
optslen += len;
opts[optslen] = '\0';
}
kmod_list_foreach(l, ctx->config->options) {