summaryrefslogtreecommitdiff
path: root/src/udev
diff options
context:
space:
mode:
Diffstat (limited to 'src/udev')
-rw-r--r--src/udev/accelerometer/accelerometer.c2
-rw-r--r--src/udev/udev-builtin-usb_id.c4
-rw-r--r--src/udev/udevadm-hwdb.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/udev/accelerometer/accelerometer.c b/src/udev/accelerometer/accelerometer.c
index b6913b46f8..e611b48a42 100644
--- a/src/udev/accelerometer/accelerometer.c
+++ b/src/udev/accelerometer/accelerometer.c
@@ -187,7 +187,7 @@ static void test_orientation(struct udev *udev,
const char *devpath)
{
OrientationUp old, new;
- int _cleanup_close_ fd = -1;
+ _cleanup_close_ int fd = -1;
struct input_event ev[64];
bool got_syn = false;
bool got_x = false, got_y = false, got_z = false;
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 269aa4e1aa..e3bbd05e4b 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -151,8 +151,8 @@ static void set_scsi_type(char *to, const char *from, size_t len)
static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len)
{
- char _cleanup_free_ *filename = NULL;
- int _cleanup_close_ fd = -1;
+ _cleanup_free_ char *filename = NULL;
+ _cleanup_close_ int fd = -1;
ssize_t size;
unsigned char buf[18 + 65535];
int pos = 0;
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index b18b28aca7..3e849aaed6 100644
--- a/src/udev/udevadm-hwdb.c
+++ b/src/udev/udevadm-hwdb.c
@@ -181,9 +181,9 @@ static int trie_insert(struct trie *trie, struct trie_node *node, const char *se
struct trie_node *child;
for (p = 0; (c = trie->strings->buf[node->prefix_off + p]); p++) {
- char _cleanup_free_ *s = NULL;
+ _cleanup_free_ char *s = NULL;
ssize_t off;
- struct trie_node _cleanup_free_ *new_child = NULL;
+ _cleanup_free_ struct trie_node *new_child = NULL;
if (c == search[i + p])
continue;