diff options
| author | Drew DeVault <sir@cmpwn.com> | 2015-10-23 10:34:38 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2015-10-23 10:34:38 -0400 |
| commit | 988a0bd67e02755308b478d369a3825c712a842e (patch) | |
| tree | c29db67ec97907448084a36909c1e51d74cd8eaf /sway/config.c | |
| parent | 8a57c48dffda7c49e59d1c56739f857c6f28b07d (diff) | |
| parent | 362413bd5031aa709ab5d7a39c0d5912554e545b (diff) | |
Merge pull request #201 from sce/cmd_results
Replace cmd_status with cmd_results struct
Diffstat (limited to 'sway/config.c')
| -rw-r--r-- | sway/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/config.c b/sway/config.c index 67f8284c..7e0b22f9 100644 --- a/sway/config.c +++ b/sway/config.c @@ -234,10 +234,11 @@ bool read_config(FILE *file, bool is_active) { while (!feof(file)) { line = read_line(file); line = strip_comments(line); - switch(config_command(line)) { + struct cmd_results *res = config_command(line); + switch(res->status) { case CMD_FAILURE: case CMD_INVALID: - sway_log(L_ERROR, "Error on line '%s'", line); + sway_log(L_ERROR, "Error on line '%s': %s", line, res->error); success = false; break; @@ -270,6 +271,7 @@ bool read_config(FILE *file, bool is_active) { default:; } free(line); + free(res); } if (is_active) { |