summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2013-06-03 08:57:49 -0400
committerAnthony G. Basile <blueness@gentoo.org>2013-06-03 08:57:49 -0400
commit09376a932b2af4c66dbf3230a8e5d604701d781b (patch)
tree7d24159dbada82232919a507aac7c1f8d49c989e
parent2e16351ec5b23e4ca1c03106ef2152d80aca7f20 (diff)
Move remaining _cleanup_free_ in front of type
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r--src/udev/udev-builtin-usb_id.c2
-rw-r--r--src/udev/udevadm-hwdb.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c
index 94e3f37a17..b021d03a65 100644
--- a/src/udev/udev-builtin-usb_id.c
+++ b/src/udev/udev-builtin-usb_id.c
@@ -151,7 +151,7 @@ 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;
+ _cleanup_free_ char *filename = NULL;
int _cleanup_close_ fd = -1;
ssize_t size;
unsigned char buf[18 + 65535];
diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c
index c71da0df8f..4c341a319c 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;