diff options
| author | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2014-06-21 05:55:17 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-06-22 00:45:15 +0200 |
| commit | c8b32e11ee24a333f8f7c7c15226741d22e55fdd (patch) | |
| tree | 3ab047e603bcf8fff6b692ad96965c34bac58bf6 /src/journal | |
| parent | 2de61bbebfe6a1a97709b3277b150cacc30a79cd (diff) | |
consistently order cleanup attribute before type
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journal-remote-parse.c | 4 | ||||
| -rw-r--r-- | src/journal/journal-remote.c | 8 | ||||
| -rw-r--r-- | src/journal/microhttpd-util.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/journal/journal-remote-parse.c b/src/journal/journal-remote-parse.c index 239ff38197..dbdf02aa3c 100644 --- a/src/journal/journal-remote-parse.c +++ b/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); diff --git a/src/journal/journal-remote.c b/src/journal/journal-remote.c index 31401fb3ee..a31dc2c980 100644 --- a/src/journal/journal-remote.c +++ b/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, ""); diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c index 9a8d5c6a12..007cb5dfdc 100644 --- a/src/journal/microhttpd-util.c +++ b/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); |