consistently order cleanup attribute before type

src/cgls/cgls.c

@@ -130,7 +130,7 @@ static int parse_argv(int argc, char *argv[]) {
 int main(int argc, char *argv[]) {
         int r = 0, retval = EXIT_FAILURE;
         int output_flags;
-        char _cleanup_free_ *root = NULL;
+        _cleanup_free_ char *root = NULL;
         _cleanup_bus_unref_ sd_bus *bus = NULL;
 
         log_parse_environment();

src/journal/journal-remote-parse.c

@@ -177,7 +177,7 @@ static int fill_fixed_size(RemoteSource *source, void **data, size_t size) {
 
 static int get_data_size(RemoteSource *source) {
         int r;
-        void _cleanup_free_ *data = NULL;
+        _cleanup_free_ void *data = NULL;
 
         assert(source);
         assert(source->state == STATE_DATA_START);
@@ -215,7 +215,7 @@ static int get_data_data(RemoteSource *source, void **data) {
 
 static int get_data_newline(RemoteSource *source) {
         int r;
-        char _cleanup_free_ *data = NULL;
+        _cleanup_free_ char *data = NULL;
 
         assert(source);
         assert(source->state == STATE_DATA_FINISH);

src/journal/journal-remote.c

@@ -139,7 +139,7 @@ static int spawn_curl(char* url) {
 
 static int spawn_getter(char *getter, char *url) {
         int r;
-        char _cleanup_strv_free_ **words = NULL;
+        _cleanup_strv_free_ char **words = NULL;
 
         assert(getter);
         words = strv_split_quoted(getter);
@@ -154,7 +154,7 @@ static int spawn_getter(char *getter, char *url) {
 }
 
 static int open_output(Writer *s, const char* url) {
-        char _cleanup_free_ *name, *output = NULL;
+        _cleanup_free_ char *name, *output = NULL;
         char *c;
         int r;
 
@@ -745,8 +745,8 @@ static int remoteserver_init(RemoteServer *s) {
         }
 
         if (arg_url) {
-                char _cleanup_free_ *url = NULL;
-                char _cleanup_strv_free_ **urlv = strv_new(arg_url, "/entries", NULL);
+                _cleanup_free_ char *url = NULL;
+                _cleanup_strv_free_ char **urlv = strv_new(arg_url, "/entries", NULL);
                 if (!urlv)
                         return log_oom();
                 url = strv_join(urlv, "");

src/journal/microhttpd-util.c

@@ -217,7 +217,7 @@ int check_permissions(struct MHD_Connection *connection, int *code) {
         const union MHD_ConnectionInfo *ci;
         gnutls_session_t session;
         gnutls_x509_crt_t client_cert;
-        char _cleanup_free_ *buf = NULL;
+        _cleanup_free_ char *buf = NULL;
         int r;
 
         assert(connection);

src/nspawn/nspawn.c

@@ -824,7 +824,7 @@ static int setup_timezone(const char *dest) {
 }
 
 static int setup_resolv_conf(const char *dest) {
-        char _cleanup_free_ *where = NULL;
+        _cleanup_free_ char *where = NULL;
 
         assert(dest);
 

src/readahead/readahead-common.c

@@ -226,7 +226,7 @@ int open_inotify(void) {
 }
 
 ReadaheadShared *shared_get(void) {
-        int _cleanup_close_ fd = -1;
+        _cleanup_close_ int fd = -1;
         ReadaheadShared *m = NULL;
 
         mkdirs();

src/shared/fileio.c

@@ -708,7 +708,7 @@ int write_env_file(const char *fname, char **l) {
 
 int executable_is_script(const char *path, char **interpreter) {
         int r;
-        char _cleanup_free_ *line = NULL;
+        _cleanup_free_ char *line = NULL;
         int len;
         char *ans;
 

src/shared/sleep-config.c

@@ -49,7 +49,7 @@ int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
         };
 
         int r;
-        FILE _cleanup_fclose_ *f;
+        _cleanup_fclose_ FILE *f;
 
         f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
         if (!f)

src/shared/socket-label.c

@@ -157,7 +157,7 @@ int make_socket_fd(int log_level, const char* address, int flags) {
         fd = socket_address_listen(&a, flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT,
                                    NULL, false, false, 0755, 0644, NULL);
         if (fd < 0 || log_get_max_level() >= log_level) {
-                char _cleanup_free_ *p = NULL;
+                _cleanup_free_ char *p = NULL;
 
                 r = socket_address_print(&a, &p);
                 if (r < 0) {

src/test/test-path-util.c

@@ -58,7 +58,7 @@ static void test_path(void) {
         assert_se(streq(basename("file.../"), ""));
 
 #define test_parent(x, y) {                                \
-                char _cleanup_free_ *z = NULL;             \
+                _cleanup_free_ char *z = NULL;             \
                 int r = path_get_parent(x, &z);            \
                 printf("expected: %s\n", y ? y : "error"); \
                 printf("actual: %s\n", r<0 ? "error" : z); \