diff options
author | Justus Winter <justus@gnupg.org> | 2017-06-19 21:20:57 +0200 |
---|---|---|
committer | Justus Winter <justus@gnupg.org> | 2017-08-05 18:42:22 +0200 |
commit | 835b293d35a209d38047126443d41fa7090daa4c (patch) | |
tree | 5bf956895e6030f91cd618fb191b2151f6d25423 /console-client/xkb | |
parent | dc0b5a43224999223a246870912b0f292b1980e9 (diff) | |
download | hurd-835b293d35a209d38047126443d41fa7090daa4c.tar.gz hurd-835b293d35a209d38047126443d41fa7090daa4c.tar.bz2 hurd-835b293d35a209d38047126443d41fa7090daa4c.zip |
Use our own variant of 'assert' and 'assert_perror'.
Our variants print stack traces on failures. This will make locating
errors much easier.
Diffstat (limited to 'console-client/xkb')
-rw-r--r-- | console-client/xkb/compose.c | 6 | ||||
-rw-r--r-- | console-client/xkb/kstoucs.c | 4 | ||||
-rw-r--r-- | console-client/xkb/xkbtimer.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/console-client/xkb/compose.c b/console-client/xkb/compose.c index fb3f07ca..17f30014 100644 --- a/console-client/xkb/compose.c +++ b/console-client/xkb/compose.c @@ -28,7 +28,7 @@ #include <fcntl.h> #include <unistd.h> #include <locale.h> -#include <assert.h> +#include <assert-backtrace.h> /* Tokens that can be recognised by the scanner. */ enum tokentype @@ -427,8 +427,8 @@ map_iterate(const char *map_path, map_callback action, void *context) size_t buffer_size = 0; size_t line_length = 0; - assert (map_path != NULL); - assert (action != NULL); + assert_backtrace (map_path != NULL); + assert_backtrace (action != NULL); map = fopen (map_path, "r"); diff --git a/console-client/xkb/kstoucs.c b/console-client/xkb/kstoucs.c index eb47bdeb..59af1e9f 100644 --- a/console-client/xkb/kstoucs.c +++ b/console-client/xkb/kstoucs.c @@ -1,4 +1,4 @@ -#include <assert.h> +#include <assert-backtrace.h> struct ksmap { int keysym; @@ -13,7 +13,7 @@ find_ucs (int keysym, struct ksmap *first, struct ksmap *last) { struct ksmap *middle = first + (last - first) / 2; - assert (first <= last); + assert_backtrace (first <= last); if (middle->keysym == keysym) return middle->ucs; /* base case: needle found. */ diff --git a/console-client/xkb/xkbtimer.c b/console-client/xkb/xkbtimer.c index 24791e9e..28e1c685 100644 --- a/console-client/xkb/xkbtimer.c +++ b/console-client/xkb/xkbtimer.c @@ -19,7 +19,7 @@ #include <mach.h> #include <errno.h> -#include <assert.h> +#include <assert-backtrace.h> #include "xkb.h" #include <timer.h> @@ -123,7 +123,7 @@ key_timing (void *handle) switch (per_key_timers[current_key].enable_status) { case timer_stopped: - assert ("Stopped timer triggered timer event\n"); + assert_backtrace ("Stopped timer triggered timer event\n"); break; case timer_slowkeys: per_key_timers[current_key].enable_timer.expires |