chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
network-address,test-network: avoid undefined behaviour
[elogind.git]
/
src
/
udev
/
udev-builtin.c
diff --git
a/src/udev/udev-builtin.c
b/src/udev/udev-builtin.c
index 0651ae2ff078528bf4d04069457107c5756ce174..1950ec23a1fb22a287f82e12875a83befc662221 100644
(file)
--- a/
src/udev/udev-builtin.c
+++ b/
src/udev/udev-builtin.c
@@
-34,13
+34,14
@@
static const struct udev_builtin *builtins[] = {
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
[UDEV_BUILTIN_BLKID] = &udev_builtin_blkid,
#endif
[UDEV_BUILTIN_BTRFS] = &udev_builtin_btrfs,
- [UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
+ [UDEV_BUILTIN_KEYBOARD] = &udev_builtin_keyboard,
#ifdef HAVE_KMOD
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
#endif
[UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
#ifdef HAVE_KMOD
[UDEV_BUILTIN_KMOD] = &udev_builtin_kmod,
#endif
[UDEV_BUILTIN_NET_ID] = &udev_builtin_net_id,
+ [UDEV_BUILTIN_NET_LINK] = &udev_builtin_net_setup_link,
[UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
[UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
#ifdef HAVE_ACL
[UDEV_BUILTIN_PATH_ID] = &udev_builtin_path_id,
[UDEV_BUILTIN_USB_ID] = &udev_builtin_usb_id,
#ifdef HAVE_ACL
@@
-48,8
+49,7
@@
static const struct udev_builtin *builtins[] = {
#endif
};
#endif
};
-void udev_builtin_init(struct udev *udev)
-{
+void udev_builtin_init(struct udev *udev) {
unsigned int i;
if (initialized)
unsigned int i;
if (initialized)
@@
-62,8
+62,7
@@
void udev_builtin_init(struct udev *udev)
initialized = true;
}
initialized = true;
}
-void udev_builtin_exit(struct udev *udev)
-{
+void udev_builtin_exit(struct udev *udev) {
unsigned int i;
if (!initialized)
unsigned int i;
if (!initialized)
@@
-76,8
+75,7
@@
void udev_builtin_exit(struct udev *udev)
initialized = false;
}
initialized = false;
}
-bool udev_builtin_validate(struct udev *udev)
-{
+bool udev_builtin_validate(struct udev *udev) {
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
@@
-86,26
+84,22
@@
bool udev_builtin_validate(struct udev *udev)
return false;
}
return false;
}
-void udev_builtin_list(struct udev *udev)
-{
+void udev_builtin_list(struct udev *udev) {
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
unsigned int i;
for (i = 0; i < ELEMENTSOF(builtins); i++)
- fprintf(stderr, " %-1
2s
%s\n", builtins[i]->name, builtins[i]->help);
+ fprintf(stderr, " %-1
4s
%s\n", builtins[i]->name, builtins[i]->help);
}
}
-const char *udev_builtin_name(enum udev_builtin_cmd cmd)
-{
+const char *udev_builtin_name(enum udev_builtin_cmd cmd) {
return builtins[cmd]->name;
}
return builtins[cmd]->name;
}
-bool udev_builtin_run_once(enum udev_builtin_cmd cmd)
-{
+bool udev_builtin_run_once(enum udev_builtin_cmd cmd) {
return builtins[cmd]->run_once;
}
return builtins[cmd]->run_once;
}
-enum udev_builtin_cmd udev_builtin_lookup(const char *command)
-{
+enum udev_builtin_cmd udev_builtin_lookup(const char *command) {
char name[UTIL_PATH_SIZE];
enum udev_builtin_cmd i;
char *pos;
char name[UTIL_PATH_SIZE];
enum udev_builtin_cmd i;
char *pos;
@@
-115,13
+109,12
@@
enum udev_builtin_cmd udev_builtin_lookup(const char *command)
if (pos)
pos[0] = '\0';
for (i = 0; i < ELEMENTSOF(builtins); i++)
if (pos)
pos[0] = '\0';
for (i = 0; i < ELEMENTSOF(builtins); i++)
- if (str
cmp(builtins[i]->name, name) == 0
)
+ if (str
eq(builtins[i]->name, name)
)
return i;
return UDEV_BUILTIN_MAX;
}
return i;
return UDEV_BUILTIN_MAX;
}
-int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test)
-{
+int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const char *command, bool test) {
char arg[UTIL_PATH_SIZE];
int argc;
char *argv[128];
char arg[UTIL_PATH_SIZE];
int argc;
char *argv[128];
@@
-133,8
+126,7
@@
int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
return builtins[cmd]->cmd(dev, argc, argv, test);
}
return builtins[cmd]->cmd(dev, argc, argv, test);
}
-int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val)
-{
+int udev_builtin_add_property(struct udev_device *dev, bool test, const char *key, const char *val) {
struct udev_list_entry *entry;
entry = udev_device_add_property(dev, key, val);
struct udev_list_entry *entry;
entry = udev_device_add_property(dev, key, val);