From: ayin Date: Thu, 10 Jan 2008 11:30:45 +0000 (+0000) Subject: Reformat assert. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=528c041ede9da809860d92ed6dc5ffb3de82267a;p=dana%2Furxvt.git Reformat assert. --- diff --git a/src/keyboard.C b/src/keyboard.C index 15a5fc86..0008e58c 100644 --- a/src/keyboard.C +++ b/src/keyboard.C @@ -454,8 +454,9 @@ keyboard_manager::setup_hash () assert (index >= 0); keysym_t *b = keymap [index]; - assert (i == (signed) index || // the normally expected result - (a->keysym + j) >= b->keysym && (a->keysym + j) <= (b->keysym + b->range) && compare_priority (a, b) <= 0); // is effectively the same or a closer match + assert (i == index // the normally expected result + || IN_RANGE_INC (a->keysym + j, b->keysym, b->keysym + b->range) + && compare_priority (a, b) <= 0); // is effectively the same or a closer match } } #endif