diff options
Diffstat (limited to 'common')
-rw-r--r-- | common/ipc-client.c | 2 | ||||
-rw-r--r-- | common/readline.c | 4 | ||||
-rw-r--r-- | common/util.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/common/ipc-client.c b/common/ipc-client.c index 1ab6627b..582c5e86 100644 --- a/common/ipc-client.c +++ b/common/ipc-client.c | |||
@@ -79,7 +79,7 @@ struct ipc_response *ipc_recv_response(int socketfd) { | |||
79 | error_2: | 79 | error_2: |
80 | free(response); | 80 | free(response); |
81 | error_1: | 81 | error_1: |
82 | sway_log(L_ERROR, "Unable to allocate memory for IPC response"); | 82 | wlr_log(L_ERROR, "Unable to allocate memory for IPC response"); |
83 | return NULL; | 83 | return NULL; |
84 | } | 84 | } |
85 | 85 | ||
diff --git a/common/readline.c b/common/readline.c index cc40a2cc..ed5801de 100644 --- a/common/readline.c +++ b/common/readline.c | |||
@@ -8,7 +8,7 @@ char *read_line(FILE *file) { | |||
8 | char *string = malloc(size); | 8 | char *string = malloc(size); |
9 | char lastChar = '\0'; | 9 | char lastChar = '\0'; |
10 | if (!string) { | 10 | if (!string) { |
11 | sway_log(L_ERROR, "Unable to allocate memory for read_line"); | 11 | wlr_log(L_ERROR, "Unable to allocate memory for read_line"); |
12 | return NULL; | 12 | return NULL; |
13 | } | 13 | } |
14 | while (1) { | 14 | while (1) { |
@@ -29,7 +29,7 @@ char *read_line(FILE *file) { | |||
29 | char *new_string = realloc(string, size *= 2); | 29 | char *new_string = realloc(string, size *= 2); |
30 | if (!new_string) { | 30 | if (!new_string) { |
31 | free(string); | 31 | free(string); |
32 | sway_log(L_ERROR, "Unable to allocate memory for read_line"); | 32 | wlr_log(L_ERROR, "Unable to allocate memory for read_line"); |
33 | return NULL; | 33 | return NULL; |
34 | } | 34 | } |
35 | string = new_string; | 35 | string = new_string; |
diff --git a/common/util.c b/common/util.c index 83981160..fb7f9454 100644 --- a/common/util.c +++ b/common/util.c | |||
@@ -113,7 +113,7 @@ uint32_t parse_color(const char *color) { | |||
113 | 113 | ||
114 | int len = strlen(color); | 114 | int len = strlen(color); |
115 | if (len != 6 && len != 8) { | 115 | if (len != 6 && len != 8) { |
116 | sway_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); | 116 | wlr_log(L_DEBUG, "Invalid color %s, defaulting to color 0xFFFFFFFF", color); |
117 | return 0xFFFFFFFF; | 117 | return 0xFFFFFFFF; |
118 | } | 118 | } |
119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); | 119 | uint32_t res = (uint32_t)strtoul(color, NULL, 16); |