dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-05 07:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

udev: inline loop variable

Browse Source
This commit is contained in:
Yu Watanabe
2022-04-11 00:02:17 +09:00
parent 262953ac77
commit 23ebdf4f86
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/udev/udev-builtin.c
View File

@@ -32,12 +32,10 @@ static const UdevBuiltin *const builtins[_UDEV_BUILTIN_MAX] = {
};
void udev_builtin_init(void) {
unsigned i;
if (initialized)
return;
for (i = 0; i < _UDEV_BUILTIN_MAX; i++)
for (UdevBuiltinCommand i = 0; i < _UDEV_BUILTIN_MAX; i++)
if (builtins[i] && builtins[i]->init)
builtins[i]->init();
@@ -45,12 +43,10 @@ void udev_builtin_init(void) {
}
void udev_builtin_exit(void) {
unsigned i;
if (!initialized)
return;
for (i = 0; i < _UDEV_BUILTIN_MAX; i++)
for (UdevBuiltinCommand i = 0; i < _UDEV_BUILTIN_MAX; i++)
if (builtins[i] && builtins[i]->exit)
builtins[i]->exit();
@@ -58,18 +54,14 @@ void udev_builtin_exit(void) {
}
bool udev_builtin_validate(void) {
unsigned i;
for (i = 0; i < _UDEV_BUILTIN_MAX; i++)
for (UdevBuiltinCommand i = 0; i < _UDEV_BUILTIN_MAX; i++)
if (builtins[i] && builtins[i]->validate && builtins[i]->validate())
return true;
return false;
}
void udev_builtin_list(void) {
unsigned i;
for (i = 0; i < _UDEV_BUILTIN_MAX; i++)
for (UdevBuiltinCommand i = 0; i < _UDEV_BUILTIN_MAX; i++)
if (builtins[i])
fprintf(stderr, " %-14s %s\n", builtins[i]->name, builtins[i]->help);
}
@@ -93,14 +85,13 @@ bool udev_builtin_run_once(UdevBuiltinCommand cmd) {
}
UdevBuiltinCommand udev_builtin_lookup(const char *command) {
UdevBuiltinCommand i;
size_t n;
assert(command);
command += strspn(command, WHITESPACE);
n = strcspn(command, WHITESPACE);
for (i = 0; i < _UDEV_BUILTIN_MAX; i++)
for (UdevBuiltinCommand i = 0; i < _UDEV_BUILTIN_MAX; i++)
if (builtins[i] && strneq(builtins[i]->name, command, n))
return i;

2
src/udev/udev-builtin.h
View File

@@ -6,7 +6,7 @@
#include "sd-device.h"
#include "sd-netlink.h"
typedef enum {
typedef enum UdevBuiltinCommand {
#if HAVE_BLKID
UDEV_BUILTIN_BLKID,
#endif