move _cleanup_ attribute in front of the type

http://lists.freedesktop.org/archives/systemd-devel/2013-April/010510.html

3 files changed, 7 insertions, 7 deletions

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 2226ebad6a..002f3df8b6 100644
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -245,7 +245,7 @@ static void do_journal_append(char *file)
         struct iovec iovec[5];
         int r, f, j = 0;
         ssize_t n;
-        char _cleanup_free_ *bootchart_file = NULL, *bootchart_message = NULL,
+        _cleanup_free_ char *bootchart_file = NULL, *bootchart_message = NULL,
                 *p = NULL;
 
         bootchart_file = strappend("BOOTCHART_FILE=", file);
diff --git a/src/bootchart/store.c b/src/bootchart/store.c
index b2652c8d93..4de187c8bc 100644
--- a/src/bootchart/store.c
+++ b/src/bootchart/store.c
@@ -56,7 +56,7 @@ double gettime_ns(void) {
 }
 
 void log_uptime(void) {
-        FILE _cleanup_fclose_ *f = NULL;
+        _cleanup_fclose_ FILE *f = NULL;
         char str[32];
         double uptime;
 
@@ -92,7 +92,7 @@ static char *bufgetline(char *buf) {
 
 static int pid_cmdline_strscpy(char *buffer, size_t buf_len, int pid) {
         char filename[PATH_MAX];
-        int _cleanup_close_ fd=-1;
+        _cleanup_close_ int fd=-1;
         ssize_t n;
 
         sprintf(filename, "%d/cmdline", pid);
@@ -246,7 +246,7 @@ schedstat_next:
 
                 /* end of our LL? then append a new record */
                 if (ps->pid != pid) {
-                        FILE _cleanup_fclose_ *st = NULL;
+                        _cleanup_fclose_ FILE *st = NULL;
                         char t[32];
                         struct ps_struct *parent;
 
diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 3472bc0ae8..1e87fb5739 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -389,7 +389,7 @@ static void svg_pss_graph(void) {
         svg("\n\n<!-- PSS map - csv format -->\n");
         ps = ps_first;
         while (ps->next_ps) {
-                char _cleanup_free_ *enc_name = NULL;
+                _cleanup_free_ char *enc_name = NULL;
                 ps = ps->next_ps;
                 if (!ps)
                         continue;
@@ -711,7 +711,7 @@ static int ps_filter(struct ps_struct *ps) {
 }
 
 static void svg_do_initcall(int count_only) {
-        FILE _cleanup_pclose_ *f = NULL;
+        _cleanup_pclose_ FILE *f = NULL;
         double t;
         char func[256];
         int ret;
@@ -815,7 +815,7 @@ static void svg_ps_bars(void) {
         /* pass 2 - ps boxes */
         ps = ps_first;
         while ((ps = get_next_ps(ps))) {
-                char _cleanup_free_ *enc_name = NULL;
+                _cleanup_free_ char *enc_name = NULL;
 
                 double starttime;
                 int t;