summaryrefslogtreecommitdiff
path: root/bus/desktop-file.c
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2018-11-20 12:17:20 +0000
committerSimon McVittie <smcv@collabora.com>2018-11-20 12:17:20 +0000
commiteef153e82815e19851d3f6dc1a9b1c901c41eb2b (patch)
tree1dea55c57128374c4bfe647bff503278ac040d06 /bus/desktop-file.c
parent3987f5a4bd75a7039e9da21d5dd01ffc1fda5063 (diff)
downloaddbus-eef153e82815e19851d3f6dc1a9b1c901c41eb2b.tar.gz
_DBUS_ASSERT_ERROR_XOR_BOOL: Add and use
As suggested by Philip Withnall in dbus!43. Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'bus/desktop-file.c')
-rw-r--r--bus/desktop-file.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/bus/desktop-file.c b/bus/desktop-file.c
index 69d628c6..af6bb4ee 100644
--- a/bus/desktop-file.c
+++ b/bus/desktop-file.c
@@ -688,11 +688,7 @@ bus_desktop_file_load (DBusString *filename,
parser.desktop_file = NULL;
out:
- if (result != NULL)
- _DBUS_ASSERT_ERROR_IS_CLEAR (error);
- else
- _DBUS_ASSERT_ERROR_IS_SET (error);
-
+ _DBUS_ASSERT_ERROR_XOR_BOOL (error, result != NULL);
parser_clear (&parser);
return result;
}