diff options
| author | KoffeinFlummi <[email protected]> | 2015-08-19 00:05:18 +0200 |
|---|---|---|
| committer | KoffeinFlummi <[email protected]> | 2015-08-19 00:05:18 +0200 |
| commit | c75d5ceba475e3c6d1fae475c610c53909a83a29 (patch) | |
| tree | 4193c748edd8d1756862babd49e34df349ca8484 /sway/config.c | |
| parent | 4c688cba4e3528921656d63a09f7015cae13cd0c (diff) | |
| parent | 443ae9b89e9e1534407c2dd273a4e47ddb3610c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into gaps
Diffstat (limited to 'sway/config.c')
| -rw-r--r-- | sway/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c index b0b66315..ced94799 100644 --- a/sway/config.c +++ b/sway/config.c @@ -188,9 +188,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; } |