From 7fd1b19bc9e9f5574f2877936b8ac267c7706947 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Thu, 18 Apr 2013 09:11:22 +0200
Subject: move _cleanup_ attribute in front of the type

http://lists.freedesktop.org/archives/systemd-devel/2013-April/010510.html
---
 src/login/inhibit.c             | 2 +-
 src/login/logind-dbus.c         | 4 ++--
 src/login/logind-seat-dbus.c    | 6 +++---
 src/login/logind-session-dbus.c | 6 +++---
 src/login/logind-user-dbus.c    | 4 ++--
 src/login/pam-module.c          | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/login')

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index fbab42aff1..fe108c6ef0 100644
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[]) {
         int r, exit_code = 0;
         DBusConnection *bus = NULL;
         DBusError error;
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
 
         dbus_error_init(&error);
 
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index b63b79d9a6..4176902a3e 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -922,7 +922,7 @@ finish:
 
 static int attach_device(Manager *m, const char *seat, const char *sysfs) {
         struct udev_device *d;
-        char _cleanup_free_ *rule = NULL, *file = NULL;
+        _cleanup_free_ char *rule = NULL, *file = NULL;
         const char *id_for_seat;
         int r;
 
@@ -971,7 +971,7 @@ finish:
 }
 
 static int flush_devices(Manager *m) {
-        DIR _cleanup_closedir_ *d;
+        _cleanup_closedir_ DIR *d;
 
         assert(m);
 
diff --git a/src/login/logind-seat-dbus.c b/src/login/logind-seat-dbus.c
index 82f25a0d1c..5c535ba0ec 100644
--- a/src/login/logind-seat-dbus.c
+++ b/src/login/logind-seat-dbus.c
@@ -61,7 +61,7 @@ static int bus_seat_append_active(DBusMessageIter *i, const char *property, void
         DBusMessageIter sub;
         Seat *s = data;
         const char *id, *path;
-        char _cleanup_free_ *p = NULL;
+        _cleanup_free_ char *p = NULL;
 
         assert(i);
         assert(property);
@@ -104,7 +104,7 @@ static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo
                 return -ENOMEM;
 
         LIST_FOREACH(sessions_by_seat, session, s->sessions) {
-                char _cleanup_free_ *p = NULL;
+                _cleanup_free_ char *p = NULL;
 
                 if (!dbus_message_iter_open_container(&sub, DBUS_TYPE_STRUCT, NULL, &sub2))
                         return -ENOMEM;
@@ -348,7 +348,7 @@ const DBusObjectPathVTable bus_seat_vtable = {
 };
 
 char *seat_bus_path(Seat *s) {
-        char _cleanup_free_ *t;
+        _cleanup_free_ char *t;
 
         assert(s);
 
diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c
index 0e425e48d3..ec823af547 100644
--- a/src/login/logind-session-dbus.c
+++ b/src/login/logind-session-dbus.c
@@ -120,7 +120,7 @@ static int bus_session_append_seat(DBusMessageIter *i, const char *property, voi
 static int bus_session_append_user(DBusMessageIter *i, const char *property, void *data) {
         DBusMessageIter sub;
         User *u = data;
-        char _cleanup_free_ *p = NULL;
+        _cleanup_free_ char *p = NULL;
 
         assert(i);
         assert(property);
@@ -197,7 +197,7 @@ static int bus_session_append_idle_hint_since(DBusMessageIter *i, const char *pr
 
 static int bus_session_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
         Session *s = data;
-        char _cleanup_free_ *t = NULL;
+        _cleanup_free_ char *t = NULL;
         int r;
         bool success;
 
@@ -448,7 +448,7 @@ const DBusObjectPathVTable bus_session_vtable = {
 };
 
 char *session_bus_path(Session *s) {
-        char _cleanup_free_ *t;
+        _cleanup_free_ char *t;
 
         assert(s);
 
diff --git a/src/login/logind-user-dbus.c b/src/login/logind-user-dbus.c
index 8cc1dd49fd..3ec3ff8e61 100644
--- a/src/login/logind-user-dbus.c
+++ b/src/login/logind-user-dbus.c
@@ -65,7 +65,7 @@ static int bus_user_append_display(DBusMessageIter *i, const char *property, voi
         DBusMessageIter sub;
         User *u = data;
         const char *id, *path;
-        char _cleanup_free_ *p = NULL;
+        _cleanup_free_ char *p = NULL;
 
         assert(i);
         assert(property);
@@ -187,7 +187,7 @@ static int bus_user_append_idle_hint_since(DBusMessageIter *i, const char *prope
 
 static int bus_user_append_default_cgroup(DBusMessageIter *i, const char *property, void *data) {
         User *u = data;
-        char _cleanup_free_ *t = NULL;
+        _cleanup_free_ char *t = NULL;
         int r;
         bool success;
 
diff --git a/src/login/pam-module.c b/src/login/pam-module.c
index 609317e9dd..13290fd8ea 100644
--- a/src/login/pam-module.c
+++ b/src/login/pam-module.c
@@ -256,15 +256,15 @@ static bool check_user_lists(
 }
 
 static int get_seat_from_display(const char *display, const char **seat, uint32_t *vtnr) {
-        char _cleanup_free_ *p = NULL;
+        _cleanup_free_ char *p = NULL;
         int r;
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
         union sockaddr_union sa = {
                 .un.sun_family = AF_UNIX,
         };
         struct ucred ucred;
         socklen_t l;
-        char _cleanup_free_ *tty = NULL;
+        _cleanup_free_ char *tty = NULL;
         int v;
 
         assert(display);
-- 
cgit v1.2.3-54-g00ecf