aboutsummaryrefslogtreecommitdiff
path: root/slave.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-01-20 16:47:05 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-01-20 16:47:05 +0000
commitc5031be4899ea516635ef7c65a6f82b3b45860b9 (patch)
tree10948eb4aface28e80d6a075fecf11fad3075618 /slave.c
parentMerge branch 'decset-1047-and-1048' (diff)
parentdebug: rename assert() to xassert(), to avoid clashing with <assert.h> (diff)
Merge branch 'stacktrace'
Diffstat (limited to 'slave.c')
-rw-r--r--slave.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/slave.c b/slave.c
index eaa21060..79008e5d 100644
--- a/slave.c
+++ b/slave.c
@@ -6,7 +6,6 @@
#include <ctype.h>
#include <unistd.h>
#include <errno.h>
-#include <assert.h>
#include <signal.h>
#include <termios.h>
@@ -18,6 +17,7 @@
#define LOG_ENABLE_DBG 0
#include "log.h"
+#include "debug.h"
#include "terminal.h"
#include "tokenize.h"
#include "xmalloc.h"
@@ -90,7 +90,7 @@ emit_one_notification(int fd, const struct user_notification *notif)
break;
}
- assert(prefix != NULL);
+ xassert(prefix != NULL);
if (write(fd, prefix, strlen(prefix)) < 0 ||
write(fd, notif->text, strlen(notif->text)) < 0 ||
@@ -314,7 +314,7 @@ slave_spawn(int ptmx, int argc, const char *cwd, char *const *argv,
setenv("SHELL", shell_argv[0], 1);
slave_exec(ptmx, shell_argv, fork_pipe[1], login_shell, notifications);
- assert(false);
+ xassert(false);
break;
default: {