diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-10-17 07:12:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 07:12:20 +0200 |
| commit | a7753693547233e4a1d6e10b1a8f6515a477f227 (patch) | |
| tree | 3b20f53b931e953f4ed495bb10e90597f3670237 /src/journal-remote/journal-remote-write.c | |
| parent | 9e7727521ff2e751ee064716ab735016abf72025 (diff) | |
| parent | 3b319885c4febb5f7ea9b5ab31c3395548ed6886 (diff) | |
Merge pull request #4391 from keszybz/treewide-macros
Use mfree more and add another function to simplify a common set&free pattern
Diffstat (limited to 'src/journal-remote/journal-remote-write.c')
| -rw-r--r-- | src/journal-remote/journal-remote-write.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c index 7bba52566e..8729372aa3 100644 --- a/src/journal-remote/journal-remote-write.c +++ b/src/journal-remote/journal-remote-write.c @@ -75,10 +75,8 @@ Writer* writer_new(RemoteServer *server) { memset(&w->metrics, 0xFF, sizeof(w->metrics)); w->mmap = mmap_cache_new(); - if (!w->mmap) { - free(w); - return NULL; - } + if (!w->mmap) + return mfree(w); w->n_ref = 1; w->server = server; @@ -103,9 +101,7 @@ Writer* writer_free(Writer *w) { if (w->mmap) mmap_cache_unref(w->mmap); - free(w); - - return NULL; + return mfree(w); } Writer* writer_unref(Writer *w) { |