chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2de61bb
)
consistently order cleanup attribute before type
author
Thomas Hindoe Paaboel Andersen
<phomes@gmail.com>
Sat, 21 Jun 2014 03:55:17 +0000
(
05:55
+0200)
committer
Tom Gundersen
<teg@jklm.no>
Sat, 21 Jun 2014 22:45:15 +0000
(
00:45
+0200)
src/cgls/cgls.c
patch
|
blob
|
history
src/journal/journal-remote-parse.c
patch
|
blob
|
history
src/journal/journal-remote.c
patch
|
blob
|
history
src/journal/microhttpd-util.c
patch
|
blob
|
history
src/nspawn/nspawn.c
patch
|
blob
|
history
src/readahead/readahead-common.c
patch
|
blob
|
history
src/shared/fileio.c
patch
|
blob
|
history
src/shared/sleep-config.c
patch
|
blob
|
history
src/shared/socket-label.c
patch
|
blob
|
history
src/test/test-path-util.c
patch
|
blob
|
history
diff --git
a/src/cgls/cgls.c
b/src/cgls/cgls.c
index bec9b59260ffb73d0b34ddebc3ebee99b8036086..052ac8ffca3395943fa18f79f80252478cf08149 100644
(file)
--- a/
src/cgls/cgls.c
+++ b/
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;
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();
_cleanup_bus_unref_ sd_bus *bus = NULL;
log_parse_environment();
diff --git
a/src/journal/journal-remote-parse.c
b/src/journal/journal-remote-parse.c
index 239ff381975703c920b0a9ad6d1e2348fe3905c6..dbdf02aa3c6ba5d8b6ad67858dedb8a4fbc0f6a7 100644
(file)
--- 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;
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);
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;
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);
assert(source);
assert(source->state == STATE_DATA_FINISH);
diff --git
a/src/journal/journal-remote.c
b/src/journal/journal-remote.c
index 31401fb3ee7e6e51d81a1abae3f06316baa3c86e..a31dc2c9801137ff44457aa1505319323e9bf579 100644
(file)
--- 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;
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);
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) {
}
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;
char *c;
int r;
@@
-745,8
+745,8
@@
static int remoteserver_init(RemoteServer *s) {
}
if (arg_url) {
}
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, "");
if (!urlv)
return log_oom();
url = strv_join(urlv, "");
diff --git
a/src/journal/microhttpd-util.c
b/src/journal/microhttpd-util.c
index 9a8d5c6a12acc38c845f0834381abd3196ff4798..007cb5dfdc6903510be9201cd13d051bab18ad90 100644
(file)
--- 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;
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);
int r;
assert(connection);
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index 8270348c1727eedb2a6458e6f94c75bd42d1cdb4..212f7223bb8e613b224d90c667ed60af1f01f547 100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-824,7
+824,7
@@
static int setup_timezone(const char *dest) {
}
static int setup_resolv_conf(const char *dest) {
}
static int setup_resolv_conf(const char *dest) {
-
char _cleanup_free_
*where = NULL;
+
_cleanup_free_ char
*where = NULL;
assert(dest);
assert(dest);
diff --git
a/src/readahead/readahead-common.c
b/src/readahead/readahead-common.c
index 890886eca1a063413e6034066b7f1f3b9d872625..eda99e8171152f4a2ccc3bf03d92809aa67ddf08 100644
(file)
--- a/
src/readahead/readahead-common.c
+++ b/
src/readahead/readahead-common.c
@@
-226,7
+226,7
@@
int open_inotify(void) {
}
ReadaheadShared *shared_get(void) {
}
ReadaheadShared *shared_get(void) {
-
int _cleanup_close_
fd = -1;
+
_cleanup_close_ int
fd = -1;
ReadaheadShared *m = NULL;
mkdirs();
ReadaheadShared *m = NULL;
mkdirs();
diff --git
a/src/shared/fileio.c
b/src/shared/fileio.c
index c7b2cd85b94b8cc0eacc452fb70c5e4ed4f3e0df..c5806249f68fa6017bf47d8ae9b0acdee4733db4 100644
(file)
--- a/
src/shared/fileio.c
+++ b/
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;
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;
int len;
char *ans;
diff --git
a/src/shared/sleep-config.c
b/src/shared/sleep-config.c
index 1972cdbb38f207f7e66d1329a369657a7f7c9bbd..867e4edaa2e79978b963594e30feee6deff594e5 100644
(file)
--- a/
src/shared/sleep-config.c
+++ b/
src/shared/sleep-config.c
@@
-49,7
+49,7
@@
int parse_sleep_config(const char *verb, char ***_modes, char ***_states) {
};
int r;
};
int r;
-
FILE _cleanup_fclose_
*f;
+
_cleanup_fclose_ FILE
*f;
f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
if (!f)
f = fopen(PKGSYSCONFDIR "/sleep.conf", "re");
if (!f)
diff --git
a/src/shared/socket-label.c
b/src/shared/socket-label.c
index 1e78dd2569cf2002f649962666f0d3f062cd12d7..eb09779b334aafe29f866a6a92236e44a803ac62 100644
(file)
--- a/
src/shared/socket-label.c
+++ b/
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) {
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) {
r = socket_address_print(&a, &p);
if (r < 0) {
diff --git
a/src/test/test-path-util.c
b/src/test/test-path-util.c
index 4ee33a9543f46302b16a733acd5a5a244d8c176e..19462c357183cd3563916a63d997aea18fb341e5 100644
(file)
--- a/
src/test/test-path-util.c
+++ b/
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) { \
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); \
int r = path_get_parent(x, &z); \
printf("expected: %s\n", y ? y : "error"); \
printf("actual: %s\n", r<0 ? "error" : z); \