Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 01:32:08 +00:00
Code Issues Projects Releases Wiki Activity

touchup style; no functional changes

Browse Source
This commit is contained in:
Mike Frysinger 2007-02-08 06:30:58 +00:00
parent 0850cdabde
commit c5d9e8ff3d
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
modutils/modprobe.c
View File

@ -264,8 +264,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
/* handle alias as a module dependent on the aliased module */ /* handle alias as a module dependent on the aliased module */
if (!*current) { if (!*current) {
(*first) = (*current) = xzalloc(sizeof(struct dep_t)); (*first) = (*current) = xzalloc(sizeof(struct dep_t));
} } else {
else {
(*current)->m_next = xzalloc(sizeof(struct dep_t)); (*current)->m_next = xzalloc(sizeof(struct dep_t));
(*current) = (*current)->m_next; (*current) = (*current)->m_next;
} }
@ -275,16 +274,14 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
if ((strcmp(mod, "off") == 0) || (strcmp(mod, "null") == 0)) { if ((strcmp(mod, "off") == 0) || (strcmp(mod, "null") == 0)) {
(*current)->m_depcnt = 0; (*current)->m_depcnt = 0;
(*current)->m_deparr = 0; (*current)->m_deparr = 0;
} } else {
else {
(*current)->m_depcnt = 1; (*current)->m_depcnt = 1;
(*current)->m_deparr = xmalloc(1 * sizeof(char *)); (*current)->m_deparr = xmalloc(1 * sizeof(char *));
(*current)->m_deparr[0] = xstrdup(mod); (*current)->m_deparr[0] = xstrdup(mod);
} }
(*current)->m_next = 0; (*current)->m_next = 0;
} }
} } else if ((strncmp(buffer, "options", 7) == 0) && isspace(buffer[7])) {
else if ((strncmp(buffer, "options", 7) == 0) && isspace(buffer[7])) {
char *mod, *opt; char *mod, *opt;
/* split the line in the module/alias name, and options */ /* split the line in the module/alias name, and options */
@ -307,8 +304,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
} }
} }
} }
} } else if ((strncmp(buffer, "include", 7) == 0) && isspace(buffer[7])) {
else if ((strncmp(buffer, "include", 7) == 0) && isspace(buffer[7])) {
int fdi; char *filename; int fdi; char *filename;
filename = skip_whitespace(buffer + 8); filename = skip_whitespace(buffer + 8);
@ -323,7 +319,7 @@ static void include_conf(struct dep_t **first, struct dep_t **current, char *buf
} }
/* /*
* This function builds a list of dependency rules from /lib/modules/`uname -r`\modules.dep. * This function builds a list of dependency rules from /lib/modules/`uname -r`/modules.dep.
* It then fills every modules and aliases with their default options, found by parsing * It then fills every modules and aliases with their default options, found by parsing
* modprobe.conf (or modules.conf, or conf.modules). * modprobe.conf (or modules.conf, or conf.modules).
*/ */
@ -411,8 +407,7 @@ static struct dep_t *build_dep(void)
/* enqueue new module */ /* enqueue new module */
if (!current) { if (!current) {
first = current = xmalloc(sizeof(struct dep_t)); first = current = xmalloc(sizeof(struct dep_t));
} } else {
else {
current->m_next = xmalloc(sizeof(struct dep_t)); current->m_next = xmalloc(sizeof(struct dep_t));
current = current->m_next; current = current->m_next;
} }
@ -425,12 +420,10 @@ static struct dep_t *build_dep(void)
current->m_next = 0; current->m_next = 0;
p = col + 1; p = col + 1;
} } else
else
/* this line is not a dep description */ /* this line is not a dep description */
p = 0; p = 0;
} } else
else
/* It's a dep description continuation */ /* It's a dep description continuation */
p = buffer; p = buffer;
@ -454,8 +447,7 @@ static struct dep_t *build_dep(void)
if (next) { if (next) {
*next = 0; *next = 0;
next--; next--;
} } else
else
next = end; next = end;
/* find the beginning of the module file name */ /* find the beginning of the module file name */
@ -648,8 +640,7 @@ static int mod_process(const struct mod_list_t *list, int do_insert)
if (do_insert) { if (do_insert) {
rc = rc2; /* only last module matters */ rc = rc2; /* only last module matters */
} } else if (!rc2) {
else if (!rc2) {
rc = 0; /* success if remove any mod */ rc = 0; /* success if remove any mod */
} }
} }
@ -747,13 +738,11 @@ static void check_dep(char *mod, struct mod_list_t **head, struct mod_list_t **t
opts = opts->m_next; opts = opts->m_next;
} }
dt = adt; dt = adt;
} } else {
else {
bb_error_msg("module %s not found", mod); bb_error_msg("module %s not found", mod);
return; return;
} }
} } else {
else {
bb_error_msg("bad alias %s", dt->m_name); bb_error_msg("bad alias %s", dt->m_name);
return; return;
} }