Remove code duplication in get_certificate_path().
authorAndrej Kacian <ticho@claws-mail.org>
Mon, 17 Dec 2018 19:20:24 +0000 (20:20 +0100)
committerAndrej Kacian <ticho@claws-mail.org>
Mon, 17 Dec 2018 19:20:24 +0000 (20:20 +0100)
src/common/ssl_certificate.c

index 7d5d50a140a7ffa4a24b1c64e0cabef014259302..7c8a2442fa9092efc39434a5bafb1b581a444ca4 100644 (file)
@@ -59,19 +59,15 @@ static gchar *get_certificate_path(const gchar *host, const gchar *port, const g
 
        if (fp != NULL && prefs_common_unsafe_ssl_certs()) {
                filename = g_strconcat(host, ".", port, ".", fp, ".cert", NULL);
-               subst_for_filename(filename);
-
-               ret = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                         "certs", G_DIR_SEPARATOR_S,
-                         filename, NULL);
        } else {
                filename = g_strconcat(host, ".", port, ".cert", NULL);
-               subst_for_filename(filename);
-
-               ret = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
-                         "certs", G_DIR_SEPARATOR_S,
-                         filename, NULL);
        }
+       subst_for_filename(filename);
+
+       ret = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+                 "certs", G_DIR_SEPARATOR_S,
+                 filename, NULL);
+
        g_free(filename);
        return ret;
 }