From 2e2a863c86d9ab646ca16bac3be0206e4f73ddcf Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 17 Jan 2017 21:07:00 +0000 Subject: [PATCH 14/16] config-parser tests: explicitly skip non-comparable elements For these types, the tagged union in the Element struct does not store anything we could usefuly compare. Based on part of a patch from Thomas Zimmermann. Signed-off-by: Simon McVittie --- bus/config-parser.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/bus/config-parser.c b/bus/config-parser.c index c8d026f9..7b3aabb2 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3268,8 +3268,29 @@ elements_equal (const Element *a, return FALSE; break; + case ELEMENT_NONE: + case ELEMENT_BUSCONFIG: + case ELEMENT_USER: + case ELEMENT_LISTEN: + case ELEMENT_AUTH: + case ELEMENT_ALLOW: + case ELEMENT_DENY: + case ELEMENT_FORK: + case ELEMENT_PIDFILE: + case ELEMENT_SERVICEDIR: + case ELEMENT_SERVICEHELPER: + case ELEMENT_INCLUDEDIR: + case ELEMENT_CONFIGTYPE: + case ELEMENT_SELINUX: + case ELEMENT_ASSOCIATE: + case ELEMENT_STANDARD_SESSION_SERVICEDIRS: + case ELEMENT_STANDARD_SYSTEM_SERVICEDIRS: + case ELEMENT_KEEP_UMASK: + case ELEMENT_SYSLOG: + case ELEMENT_ALLOW_ANONYMOUS: + case ELEMENT_APPARMOR: default: - /* do nothing */ + /* do nothing: nothing in the Element struct for these types */ break; } -- 2.11.0