chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: place opening { at the same line as the function declaration
[elogind.git]
/
src
/
udev
/
udev-builtin-hwdb.c
diff --git
a/src/udev/udev-builtin-hwdb.c
b/src/udev/udev-builtin-hwdb.c
index f1c0ca9cb1d6dda00c9f9f0a5bbd8fb0cc5607fc..cac97e756bb58e211507f5683a903b06b7edea49 100644
(file)
--- a/
src/udev/udev-builtin-hwdb.c
+++ b/
src/udev/udev-builtin-hwdb.c
@@
-102,13
+102,12
@@
static int udev_builtin_hwdb_search(struct udev_device *dev, struct udev_device
if (subsystem && !streq(dsubsys, subsystem))
continue;
if (subsystem && !streq(dsubsys, subsystem))
continue;
+ modalias = udev_device_get_property_value(d, "MODALIAS");
+
/* the usb_device does not have a modalias, compose one */
/* the usb_device does not have a modalias, compose one */
- if (streq(dsubsys, "usb"))
+ if (
!modalias &&
streq(dsubsys, "usb"))
modalias = modalias_usb(d, s, sizeof(s));
modalias = modalias_usb(d, s, sizeof(s));
- if (!modalias)
- modalias = udev_device_get_property_value(d, "MODALIAS");
-
if (!modalias)
continue;
if (!modalias)
continue;
@@
-184,8
+183,7
@@
static int builtin_hwdb(struct udev_device *dev, int argc, char *argv[], bool te
}
/* called at udev startup and reload */
}
/* called at udev startup and reload */
-static int builtin_hwdb_init(struct udev *udev)
-{
+static int builtin_hwdb_init(struct udev *udev) {
if (hwdb)
return 0;
hwdb = udev_hwdb_new(udev);
if (hwdb)
return 0;
hwdb = udev_hwdb_new(udev);
@@
-195,14
+193,12
@@
static int builtin_hwdb_init(struct udev *udev)
}
/* called on udev shutdown and reload request */
}
/* called on udev shutdown and reload request */
-static void builtin_hwdb_exit(struct udev *udev)
-{
+static void builtin_hwdb_exit(struct udev *udev) {
hwdb = udev_hwdb_unref(hwdb);
}
/* called every couple of seconds during event activity; 'true' if config has changed */
hwdb = udev_hwdb_unref(hwdb);
}
/* called every couple of seconds during event activity; 'true' if config has changed */
-static bool builtin_hwdb_validate(struct udev *udev)
-{
+static bool builtin_hwdb_validate(struct udev *udev) {
return udev_hwdb_validate(hwdb);
}
return udev_hwdb_validate(hwdb);
}