diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:27:56 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2018-07-23 20:31:11 -0400 |
| commit | f4b882475eee7a81c206c7825616cc4656b2f60b (patch) | |
| tree | 38e6ebf81b235424f105dcbcbb194e5e9eac70c0 /common/readline.c | |
| parent | Implement pid->workspace tracking (diff) | |
| parent | Merge pull request #2342 from RyanDwyer/update-cursor (diff) | |
| download | sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.gz sway-f4b882475eee7a81c206c7825616cc4656b2f60b.tar.zst sway-f4b882475eee7a81c206c7825616cc4656b2f60b.zip | |
Merge branch 'master' into pid-workspaces
Diffstat (limited to 'common/readline.c')
| -rw-r--r-- | common/readline.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/readline.c b/common/readline.c index 1c396a90..a2c69018 100644 --- a/common/readline.c +++ b/common/readline.c | |||
| @@ -9,7 +9,7 @@ char *read_line(FILE *file) { | |||
| 9 | char *string = malloc(size); | 9 | char *string = malloc(size); |
| 10 | char lastChar = '\0'; | 10 | char lastChar = '\0'; |
| 11 | if (!string) { | 11 | if (!string) { |
| 12 | wlr_log(L_ERROR, "Unable to allocate memory for read_line"); | 12 | wlr_log(WLR_ERROR, "Unable to allocate memory for read_line"); |
| 13 | return NULL; | 13 | return NULL; |
| 14 | } | 14 | } |
| 15 | while (1) { | 15 | while (1) { |
| @@ -30,7 +30,7 @@ char *read_line(FILE *file) { | |||
| 30 | char *new_string = realloc(string, size *= 2); | 30 | char *new_string = realloc(string, size *= 2); |
| 31 | if (!new_string) { | 31 | if (!new_string) { |
| 32 | free(string); | 32 | free(string); |
| 33 | wlr_log(L_ERROR, "Unable to allocate memory for read_line"); | 33 | wlr_log(WLR_ERROR, "Unable to allocate memory for read_line"); |
| 34 | return NULL; | 34 | return NULL; |
| 35 | } | 35 | } |
| 36 | string = new_string; | 36 | string = new_string; |