mirrors/foot
1
0
Fork 0
mirror of https://codeberg.org/dnkl/foot.git synced 2026-05-06 06:47:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

notify: stdout is a bad name

Browse source
This commit is contained in:
Daniel Eklöf 2024-07-23 09:42:14 +02:00
parent b319618af1
commit c7cffea9ee
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
notify.c
View file

@ -28,13 +28,13 @@ notify_free(struct terminal *term, struct notification *notif)
free(notif->body); free(notif->body);
free(notif->icon); free(notif->icon);
free(notif->xdg_token); free(notif->xdg_token);
free(notif->stdout); free(notif->stdout_data);
} }
static void static void
consume_stdout(struct notification *notif, bool eof) consume_stdout(struct notification *notif, bool eof)
{ {
char *data = notif->stdout; char *data = notif->stdout_data;
const char *line = data; const char *line = data;
size_t left = notif->stdout_sz; size_t left = notif->stdout_sz;
@ -60,7 +60,7 @@ consume_stdout(struct notification *notif, bool eof)
left -= len + (eol != NULL ? 1 : 0); left -= len + (eol != NULL ? 1 : 0);
} }
memmove(notif->stdout, data, left); memmove(notif->stdout_data, data, left);
notif->stdout_sz = left; notif->stdout_sz = left;
} }
@ -92,12 +92,12 @@ fdm_notify_stdout(struct fdm *fdm, int fd, int events, void *data)
} }
if (count > 0 && notif != NULL) { if (count > 0 && notif != NULL) {
if (notif->stdout == NULL) { if (notif->stdout_data == NULL) {
xassert(notif->stdout_sz == 0); xassert(notif->stdout_sz == 0);
notif->stdout = xmemdup(buf, count); notif->stdout_data = xmemdup(buf, count);
} else { } else {
notif->stdout = xrealloc(notif->stdout, notif->stdout_sz + count); notif->stdout_data = xrealloc(notif->stdout_data, notif->stdout_sz + count);
memcpy(&notif->stdout[notif->stdout_sz], buf, count); memcpy(&notif->stdout_data[notif->stdout_sz], buf, count);
} }
notif->stdout_sz += count; notif->stdout_sz += count;
@ -156,7 +156,7 @@ notify_notify(const struct terminal *term, struct notification *notif)
xassert(notif->xdg_token == NULL); xassert(notif->xdg_token == NULL);
xassert(notif->pid == 0); xassert(notif->pid == 0);
xassert(notif->stdout_fd == 0); xassert(notif->stdout_fd == 0);
xassert(notif->stdout == NULL); xassert(notif->stdout_data == NULL);
notif->pid = -1; notif->pid = -1;
notif->stdout_fd = -1; notif->stdout_fd = -1;

2
notify.h
View file

@ -45,7 +45,7 @@ struct notification {
pid_t pid; /* Notifier command PID */ pid_t pid; /* Notifier command PID */
int stdout_fd; /* Notifier command's stdout */ int stdout_fd; /* Notifier command's stdout */
char *stdout; /* Data we've reado from command's stdout */ char *stdout_data; /* Data we've reado from command's stdout */
size_t stdout_sz; size_t stdout_sz;
}; };