aboutsummaryrefslogtreecommitdiff
path: root/sway/config.c
diff options
context:
space:
mode:
authorHalf-Shot <half-shot@molrams.com>2015-08-18 21:42:28 +0100
committerHalf-Shot <half-shot@molrams.com>2015-08-18 21:42:28 +0100
commitf314d951039031fd7f0bd8772b6916587ebb0846 (patch)
tree7287a3f02593906ae23aec234fbe6e2ca1b06d1d /sway/config.c
parentd6ab5e481be2faa0e911d0b3109ae01fe79eb25f (diff)
parentfeb0195341b4caabfc3338bb29acf027b1e53780 (diff)
Merge branch 'master' of https://github.com/SirCmpwn/sway
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c
index 6d39839d..f1de6080 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -186,9 +186,10 @@ bool read_config(FILE *file, bool is_active) {
int temp_depth = 0; // Temporary: skip all config sections with depth
while (!feof(file)) {
+ int _;
char *line = read_line(file);
- strip_comments(line);
- strip_whitespace(line);
+ line = strip_comments(line);
+ line = strip_whitespace(line, &_);
if (!line[0]) {
goto _continue;
}