keypad widget cleanup

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@752 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/widget_gpo.c b/widget_gpo.c
index 3ac7a4e5a21d0890cbe00de8114462658e52c005..2b8ed98d63be24ad02c1c8e2c91e6155d8daba83 100644 (file)
--- a/widget_gpo.c
+++ b/widget_gpo.c
@@ -106,14 +106,12 @@ int widget_gpo_init(WIDGET * Self)
 
 int widget_gpo_quit(WIDGET * Self)
 {
-    if (Self) {
-       if (Self->data) {
-           WIDGET_GPO *GPO = Self->data;
-           property_free(&GPO->expression);
-           property_free(&GPO->update);
-           free(Self->data);
-           Self->data = NULL;
-       }
+    if (Self && Self->data) {
+       WIDGET_GPO *GPO = Self->data;
+       property_free(&GPO->expression);
+       property_free(&GPO->update);
+       free(Self->data);
+       Self->data = NULL;
     }
     return 0;
 }

diff --git a/widget_keypad.c b/widget_keypad.c
index 671409102a8c04ab54d8e32082426e215861234a..687630d25219b50b9f6d0f2f349a401182cbcd8e 100644 (file)
--- a/widget_keypad.c
+++ b/widget_keypad.c
@@ -110,14 +110,12 @@ int widget_keypad_init(WIDGET * Self)
 int widget_keypad_find(WIDGET * Self, void *needle)
 {
     WIDGET_KEYPAD *keypad;
-    unsigned int *n = needle;
-
-    if (Self) {
-       if (Self->data) {
-           keypad = Self->data;
-           if (keypad->key == *n)
-               return 0;
-       }
+    KEYPADKEY key = *(KEYPADKEY *) needle;
+
+    if (Self && Self->data) {
+       keypad = Self->data;
+       if (keypad->key == key)
+           return 0;
     }
 
     return -1;
@@ -125,12 +123,10 @@ int widget_keypad_find(WIDGET * Self, void *needle)
 
 int widget_keypad_quit(WIDGET * Self)
 {
-    if (Self) {
-       if (Self->data) {
-           WIDGET_KEYPAD *keypad = Self->data;
-           property_free(&keypad->expression);
-           free(Self->data);
-       }
+    if (Self && Self->data) {
+       WIDGET_KEYPAD *keypad = Self->data;
+       property_free(&keypad->expression);
+       free(Self->data);
        Self->data = NULL;
     }
     return 0;