diff options
author | Simon Ser <contact@emersion.fr> | 2023-02-28 16:43:05 +0100 |
---|---|---|
committer | Simon Ser <contact@emersion.fr> | 2023-04-14 18:34:54 +0200 |
commit | 08c1946d71039e583696842c3558b337aede1cbf (patch) | |
tree | 3873db2edfb31146bd6cd17dae63f068aef34f05 /sway/swaynag.c | |
parent | common/gesture: use format_str() (diff) | |
download | sway-08c1946d71039e583696842c3558b337aede1cbf.tar.gz sway-08c1946d71039e583696842c3558b337aede1cbf.tar.zst sway-08c1946d71039e583696842c3558b337aede1cbf.zip |
Use format_str() throughout
Diffstat (limited to 'sway/swaynag.c')
-rw-r--r-- | sway/swaynag.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/sway/swaynag.c b/sway/swaynag.c index 4a0a6d30..6031174d 100644 --- a/sway/swaynag.c +++ b/sway/swaynag.c | |||
@@ -145,22 +145,16 @@ void swaynag_log(const char *swaynag_command, struct swaynag_instance *swaynag, | |||
145 | 145 | ||
146 | va_list args; | 146 | va_list args; |
147 | va_start(args, fmt); | 147 | va_start(args, fmt); |
148 | size_t length = vsnprintf(NULL, 0, fmt, args) + 1; | 148 | char *str = vformat_str(fmt, args); |
149 | va_end(args); | 149 | va_end(args); |
150 | 150 | if (!str) { | |
151 | char *temp = malloc(length + 1); | ||
152 | if (!temp) { | ||
153 | sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry."); | 151 | sway_log(SWAY_ERROR, "Failed to allocate buffer for swaynag log entry."); |
154 | return; | 152 | return; |
155 | } | 153 | } |
156 | 154 | ||
157 | va_start(args, fmt); | 155 | write(swaynag->fd[1], str, strlen(str)); |
158 | vsnprintf(temp, length, fmt, args); | ||
159 | va_end(args); | ||
160 | |||
161 | write(swaynag->fd[1], temp, length); | ||
162 | 156 | ||
163 | free(temp); | 157 | free(str); |
164 | } | 158 | } |
165 | 159 | ||
166 | void swaynag_show(struct swaynag_instance *swaynag) { | 160 | void swaynag_show(struct swaynag_instance *swaynag) { |