summaryrefslogtreecommitdiff
path: root/src/udev/udev-builtin-path_id.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-07-31 20:17:33 +0200
committerDaniel Mack <github@zonque.org>2015-07-31 20:17:33 +0200
commit6f7897f9d2bd5ec7d6a9be8ad700661bb17a21cf (patch)
treef03d3e452e8433c350616f6ffc7d28b08bd23335 /src/udev/udev-builtin-path_id.c
parent97d09a62836e1c6f807837cf47e83c970cecb06b (diff)
parent97b11eedff9d2e17101ad453caf9e48b73246719 (diff)
Merge pull request #814 from dvdhrm/mfree
tree-wide: introduce mfree()
Diffstat (limited to 'src/udev/udev-builtin-path_id.c')
-rw-r--r--src/udev/udev-builtin-path_id.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/udev/udev-builtin-path_id.c b/src/udev/udev-builtin-path_id.c
index 4ca0a69d7d..aa5cda6fe7 100644
--- a/src/udev/udev-builtin-path_id.c
+++ b/src/udev/udev-builtin-path_id.c
@@ -674,20 +674,16 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool
* might produce conflicting IDs if the parent does not provide a
* unique and predictable name.
*/
- if (!supported_parent) {
- free(path);
- path = NULL;
- }
+ if (!supported_parent)
+ path = mfree(path);
/*
* Do not return block devices without a well-known transport. Some
* devices do not expose their buses and do not provide a unique
* and predictable name that way.
*/
- if (streq(udev_device_get_subsystem(dev), "block") && !supported_transport) {
- free(path);
- path = NULL;
- }
+ if (streq(udev_device_get_subsystem(dev), "block") && !supported_transport)
+ path = mfree(path);
out:
if (path != NULL) {