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/udev | |
| 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/udev')
| -rw-r--r-- | src/udev/udev-ctrl.c | 3 | ||||
| -rw-r--r-- | src/udev/udev-rules.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index f68a09d7a8..7717ac7924 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -211,8 +211,7 @@ struct udev_ctrl_connection *udev_ctrl_get_connection(struct udev_ctrl *uctrl) { err: if (conn->sock >= 0) close(conn->sock); - free(conn); - return NULL; + return mfree(conn); } struct udev_ctrl_connection *udev_ctrl_connection_ref(struct udev_ctrl_connection *conn) { diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c index 26fa52cf6c..7619c8371b 100644 --- a/src/udev/udev-rules.c +++ b/src/udev/udev-rules.c @@ -1583,8 +1583,7 @@ struct udev_rules *udev_rules_unref(struct udev_rules *rules) { strbuf_cleanup(rules->strbuf); free(rules->uids); free(rules->gids); - free(rules); - return NULL; + return mfree(rules); } bool udev_rules_check_timestamp(struct udev_rules *rules) { |