chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: use _cleanup_
[elogind.git]
/
src
/
udev
/
udev-builtin.c
diff --git
a/src/udev/udev-builtin.c
b/src/udev/udev-builtin.c
index 32e6e1e90c6da6c7b018800694428117abc6cf20..13922d3ce3d66da11649957c4e4fd4179b035d98 100644
(file)
--- a/
src/udev/udev-builtin.c
+++ b/
src/udev/udev-builtin.c
@@
-34,7
+34,9
@@
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,
+#ifdef ENABLE_FIRMWARE
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
[UDEV_BUILTIN_FIRMWARE] = &udev_builtin_firmware,
+#endif
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
#ifdef HAVE_KMOD
[UDEV_BUILTIN_HWDB] = &udev_builtin_hwdb,
[UDEV_BUILTIN_INPUT_ID] = &udev_builtin_input_id,
#ifdef HAVE_KMOD
@@
-110,12
+112,12
@@
enum udev_builtin_cmd udev_builtin_lookup(const char *command)
enum udev_builtin_cmd i;
char *pos;
enum udev_builtin_cmd i;
char *pos;
-
util_
strscpy(name, sizeof(name), command);
+ strscpy(name, sizeof(name), command);
pos = strchr(name, ' ');
if (pos)
pos[0] = '\0';
for (i = 0; i < ELEMENTSOF(builtins); i++)
pos = strchr(name, ' ');
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;
}
@@
-128,7
+130,7
@@
int udev_builtin_run(struct udev_device *dev, enum udev_builtin_cmd cmd, const c
/* we need '0' here to reset the internal state */
optind = 0;
/* we need '0' here to reset the internal state */
optind = 0;
-
util_
strscpy(arg, sizeof(arg), command);
+ strscpy(arg, sizeof(arg), command);
udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
return builtins[cmd]->cmd(dev, argc, argv, test);
}
udev_build_argv(udev_device_get_udev(dev), arg, &argc, argv);
return builtins[cmd]->cmd(dev, argc, argv, test);
}