Merge pull request #8993 from keszybz/sd-resolve-coverity-and-related-fixes

author Lennart Poettering <lennart@poettering.net>

Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)

committer GitHub <noreply@github.com>

Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)
author Lennart Poettering <lennart@poettering.net>
Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)
committer GitHub <noreply@github.com>
Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)
diff --cc src/basic/path-util.c
Simple merge
diff --cc src/test/test-fileio.c
Simple merge
diff --cc src/test/test-unit-file.c
Simple merge
author	Lennart Poettering <lennart@poettering.net>
	Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)
committer	GitHub <noreply@github.com>
	Fri, 18 May 2018 18:30:12 +0000 (20:30 +0200)
		1	2
src/basic/path-util.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-fileio.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test-unit-file.c	patch \|	diff1 \|	diff2 \|	blob \| history