1 files changed, 10 insertions, 10 deletions

diff --git a/src/buttons.c b/src/buttons.c
index 3f1374c..1c42d5a 100644
--- a/src/buttons.c
+++ b/src/buttons.c
@@ -193,7 +193,7 @@ bbar_handle_enter_notify(event_t *ev)
 
     REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &buttonbar->event_data), 0);
 
-    if ((bbar = find_bbar_by_window(ev->xany.window)) == NULL) {
+    if (!(bbar = find_bbar_by_window(ev->xany.window))) {
         return 0;
     }
     bbar_draw(bbar, IMAGE_STATE_SELECTED, 0);
@@ -215,7 +215,7 @@ bbar_handle_leave_notify(event_t *ev)
 
     REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &buttonbar->event_data), 0);
 
-    if ((bbar = find_bbar_by_window(ev->xany.window)) == NULL) {
+    if (!(bbar = find_bbar_by_window(ev->xany.window))) {
         return 0;
     }
     bbar_draw(bbar, IMAGE_STATE_NORMAL, 0);
@@ -234,7 +234,7 @@ bbar_handle_button_press(event_t *ev)
 
     REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &buttonbar->event_data), 0);
 
-    if ((bbar = find_bbar_by_window(ev->xany.window)) == NULL) {
+    if (!(bbar = find_bbar_by_window(ev->xany.window))) {
         D_EVENTS((" -> No buttonbar found for this window.\n"));
         return 0;
     }
@@ -326,7 +326,7 @@ bbar_handle_button_release(event_t *ev)
 
     REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &buttonbar->event_data), 0);
 
-    if ((bbar = find_bbar_by_window(ev->xany.window)) == NULL) {
+    if (!(bbar = find_bbar_by_window(ev->xany.window))) {
         D_EVENTS((" -> No buttonbar found for this window.\n"));
         return 0;
     }
@@ -364,7 +364,7 @@ bbar_handle_motion_notify(event_t *ev)
 
     REQUIRE_RVAL(XEVENT_IS_MYWIN(ev, &buttonbar->event_data), 0);
 
-    if ((bbar = find_bbar_by_window(ev->xany.window)) == NULL) {
+    if (!(bbar = find_bbar_by_window(ev->xany.window))) {
         return 0;
     }
     while (XCheckTypedWindowEvent(Xdisplay, ev->xany.window, MotionNotify, ev));
@@ -392,7 +392,7 @@ bbar_handle_motion_notify(event_t *ev)
 unsigned char
 bbar_dispatch_event(event_t *ev)
 {
-    if (buttonbar->event_data.handlers[ev->type] != NULL) {
+    if (buttonbar->event_data.handlers[ev->type]) {
         return ((buttonbar->event_data.handlers[ev->type]) (ev));
     }
     return (0);
@@ -721,7 +721,7 @@ button_t *find_button_by_index(buttonbar_t *bbar, long idx)
     } else {
         b = bbar->buttons;
     }
-    for (i = 0; (b != NULL) && (i < idx); b = b->next, i++);
+    for (i = 0; (b) && (i < idx); b = b->next, i++);
     return ((i == idx) ? (b) : (NULL));
 }
 
@@ -816,19 +816,19 @@ button_set_action(button_t *button, action_type_t type, char *action)
     switch (type) {
         case ACTION_MENU:
             button->action.menu = find_menu_by_title(menu_list, action);
-            return ((button->action.menu == NULL) ? (0) : (1));
+            return ((!button->action.menu) ? (0) : (1));
             break;
         case ACTION_STRING:
         case ACTION_ECHO:
             button->action.string = (char *) MALLOC(strlen(action) + 2);
             strcpy(button->action.string, action);
             parse_escaped_string(button->action.string);
-            return ((button->action.string == NULL) ? (0) : (1));
+            return ((!button->action.string) ? (0) : (1));
             break;
         case ACTION_SCRIPT:
             button->action.script = (char *) MALLOC(strlen(action) + 2);
             strcpy(button->action.script, action);
-            return ((button->action.script == NULL) ? (0) : (1));
+            return ((!button->action.script) ? (0) : (1));
             break;
         default:
             break;