shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-25 23:21:33 +03:00
Code

journal-remote: destroy RemoteServer object by using _cleanup_ attribute

Browse Source
This commit is contained in:
Yu Watanabe 2018-11-26 17:50:52 +09:00
parent f36bb1e182
commit 94952201e1
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/journal-remote/journal-remote-main.c
View File

@ -1062,7 +1062,7 @@ static int load_certificates(char **key, char **cert, char **trust) {
}
int main(int argc, char **argv) {
RemoteServer s = {};
_cleanup_(journal_remote_server_destroy) RemoteServer s = {};
int r;
_cleanup_free_ char *key = NULL, *cert = NULL, *trust = NULL;
@ -1126,8 +1126,6 @@ int main(int argc, char **argv) {
"STATUS=Shutting down after writing %" PRIu64 " entries...", s.event_count);
log_info("Finishing after writing %" PRIu64 " entries", s.event_count);
journal_remote_server_destroy(&s);
free(arg_key);
free(arg_cert);
free(arg_trust);

3
src/journal-remote/journal-remote.c
View File

@ -346,7 +346,7 @@ static void MHDDaemonWrapper_free(MHDDaemonWrapper *d) {
}
#endif
RemoteServer* journal_remote_server_destroy(RemoteServer *s) {
void journal_remote_server_destroy(RemoteServer *s) {
size_t i;
#if HAVE_MICROHTTPD
@ -370,7 +370,6 @@ RemoteServer* journal_remote_server_destroy(RemoteServer *s) {
journal_remote_server_global = NULL;
/* fds that we're listening on remain open... */
return NULL;
}
/**********************************************************************

2
src/journal-remote/journal-remote.h
View File

@ -62,4 +62,4 @@ int journal_remote_handle_raw_source(
uint32_t revents,
RemoteServer *s);
RemoteServer* journal_remote_server_destroy(RemoteServer *s);
void journal_remote_server_destroy(RemoteServer *s);