From: Quentin Rameau <quinq@fifth.space>
Date: Thu, 19 Nov 2015 23:17:50 +0000 (+0100)
Subject: Simplify building of stylefiles path
X-Git-Url: https://git.danieliu.xyz/?a=commitdiff_plain;h=2c2a7b608e01d2347812a84ecb08f98cb4d13789;p=surf.git

Simplify building of stylefiles path

We can directly use style file pointers instead of using temporary
string pointers.
---

diff --git a/surf.c b/surf.c
index f227d4c..4251690 100644
--- a/surf.c
+++ b/surf.c
@@ -1263,7 +1263,6 @@ void
 setup(void)
 {
 	int i;
-	char *styledirfile, *stylepath;
 	WebKitWebContext *context;
 	GError *error = NULL;
 
@@ -1282,6 +1281,7 @@ setup(void)
 	cookiefile = buildfile(cookiefile);
 	scriptfile = buildfile(scriptfile);
 	cachedir   = buildpath(cachedir);
+
 	if (stylefile == NULL) {
 		styledir = buildpath(styledir);
 		for (i = 0; i < LENGTH(styles); i++) {
@@ -1292,19 +1292,12 @@ setup(void)
 				        styles[i].regex);
 				styles[i].regex = NULL;
 			}
-			styledirfile    = g_strconcat(styledir, "/",
-			                              styles[i].style, NULL);
-			stylepath       = buildfile(styledirfile);
-			styles[i].style = g_strconcat("file://", stylepath,
-			                              NULL);
-			g_free(styledirfile);
-			g_free(stylepath);
+			styles[i].style = g_strconcat(styledir, "/",
+			    styles[i].style, NULL);
 		}
 		g_free(styledir);
 	} else {
-		stylepath = buildfile(stylefile);
-		stylefile = g_strconcat("file://", stylepath, NULL);
-		g_free(stylepath);
+		stylefile = buildfile(stylefile);
 	}
 }