From 1e4612e476c48a4620a347948b5c1bf698dc1f43 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 23 Feb 2015 15:55:28 +0100 Subject: [PATCH] keyfile: add code comment to cert_writer() and downgrade assertion to g_critical() --- src/settings/plugins/keyfile/writer.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c index 314ff11608..483835048a 100644 --- a/src/settings/plugins/keyfile/writer.c +++ b/src/settings/plugins/keyfile/writer.c @@ -569,8 +569,15 @@ cert_writer (GKeyFile *file, g_error_free (error); } g_free (new_path); - } else - g_assert_not_reached (); + } else { + /* scheme_func() returns UNKNOWN in all other cases. The only valid case + * where a scheme is allowed to be UNKNOWN, is unsetting the value. In this + * case, we don't expect the writer to be called, because the default value + * will not be serialized. + * The only other reason for the scheme to be UNKNOWN is an invalid cert. + * But our connection verifies, so that cannot happen either. */ + g_return_if_reached (); + } } typedef struct {