mirror of
https://github.com/sheumann/hush.git
synced 2025-02-22 10:29:10 +00:00
mdev: tiny shrinkage by index_in_strings
text data bss dec hex filename 2633 0 0 2633 a49 util-linux/mdev.o.old 2624 0 0 2624 a40 util-linux/mdev.o Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
b35e3a8612
commit
6531f0923b
@ -526,6 +526,9 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
char *seq;
|
char *seq;
|
||||||
char *action;
|
char *action;
|
||||||
char *env_path;
|
char *env_path;
|
||||||
|
static const char keywords[] ALIGN1 = "remove\0add\0";
|
||||||
|
enum { OP_remove = 0, OP_add };
|
||||||
|
smalluint op;
|
||||||
|
|
||||||
/* Hotplug:
|
/* Hotplug:
|
||||||
* env ACTION=... DEVPATH=... SUBSYSTEM=... [SEQNUM=...] mdev
|
* env ACTION=... DEVPATH=... SUBSYSTEM=... [SEQNUM=...] mdev
|
||||||
@ -538,7 +541,7 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
if (!action || !env_path /*|| !subsystem*/)
|
if (!action || !env_path /*|| !subsystem*/)
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
fw = getenv("FIRMWARE");
|
fw = getenv("FIRMWARE");
|
||||||
|
op = index_in_strings(keywords, action);
|
||||||
/* If it exists, does /dev/mdev.seq match $SEQNUM?
|
/* If it exists, does /dev/mdev.seq match $SEQNUM?
|
||||||
* If it does not match, earlier mdev is running
|
* If it does not match, earlier mdev is running
|
||||||
* in parallel, and we need to wait */
|
* in parallel, and we need to wait */
|
||||||
@ -565,14 +568,14 @@ int mdev_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
snprintf(temp, PATH_MAX, "/sys%s", env_path);
|
snprintf(temp, PATH_MAX, "/sys%s", env_path);
|
||||||
if (strcmp(action, "remove") == 0) {
|
if (op == OP_remove) {
|
||||||
/* Ignoring "remove firmware". It was reported
|
/* Ignoring "remove firmware". It was reported
|
||||||
* to happen and to cause erroneous deletion
|
* to happen and to cause erroneous deletion
|
||||||
* of device nodes. */
|
* of device nodes. */
|
||||||
if (!fw)
|
if (!fw)
|
||||||
make_device(temp, 1);
|
make_device(temp, 1);
|
||||||
}
|
}
|
||||||
else if (strcmp(action, "add") == 0) {
|
else if (op == OP_add) {
|
||||||
make_device(temp, 0);
|
make_device(temp, 0);
|
||||||
if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
|
if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
|
||||||
if (fw)
|
if (fw)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user