r12123: handle fde == NULL at the correct level

metze
(This used to be commit 1dd5bb60a5047b94034eb084473bb8f4a9926e7c)

diff --git a/source4/gtk/common/gtk_events.c b/source4/gtk/common/gtk_events.c
index 3301ca2b752c431ee9dc541dfc9b0ffc7ef284a5..f844ab01c92714197fb2158a226787590595cd04 100644 (file)
--- a/source4/gtk/common/gtk_events.c
+++ b/source4/gtk/common/gtk_events.c
@@ -171,8 +171,6 @@ static struct fd_event *gtk_event_add_fd(struct event_context *ev, TALLOC_CTX *m
 */
 static uint16_t gtk_event_get_fd_flags(struct fd_event *fde)
 {
-       if (!fde) return 0;
-
        return fde->flags;
 }
 
@@ -185,8 +183,6 @@ static void gtk_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
                                                      struct gtk_fd_event);
        GIOCondition condition = 0;
 
-       if (!fde) return;
-
        if (fde->flags == flags) return;
 
        if (flags & EVENT_FD_READ)

diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index 4e6eeef78e62290fb90403a4860c90e06a5bd5f1..7aa8d680fcbf6f036ac7def9077e9cc122c93adb 100644 (file)
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -115,6 +115,7 @@ struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx,
 */
 uint16_t event_get_fd_flags(struct fd_event *fde)
 {
+       if (!fde) return 0;
        return fde->event_ctx->ops->get_fd_flags(fde);
 }
 
@@ -123,6 +124,7 @@ uint16_t event_get_fd_flags(struct fd_event *fde)
 */
 void event_set_fd_flags(struct fd_event *fde, uint16_t flags)
 {
+       if (!fde) return;
        fde->event_ctx->ops->set_fd_flags(fde, flags);
 }
 

diff --git a/source4/lib/events/events_liboop.c b/source4/lib/events/events_liboop.c
index 54cb8d5a526ab363755c25ba41fc653c951bfd4e..d2d80ce0757539c13a6dd94e8e3d9a650b35d3c7 100644 (file)
--- a/source4/lib/events/events_liboop.c
+++ b/source4/lib/events/events_liboop.c
@@ -20,7 +20,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* NOTE: this code compiles fine, but is completly *UNTESTED*
+/* 
+NOTE: this code compiles fine, but is completly *UNTESTED*
          and is only commited as example
 */
 
@@ -30,6 +31,15 @@
 
 #include <oop.h>
 
+/*
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 
+
+ NOTE: this code compiles fine, but is completly *UNTESTED*
+       and is only commited as example
+
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  
+*/
+
 static int oop_event_context_destructor(void *ptr)
 {
        struct event_context *ev = talloc_get_type(ptr, struct event_context);
@@ -139,8 +149,6 @@ static struct fd_event *oop_event_add_fd(struct event_context *ev, TALLOC_CTX *m
 */
 static uint16_t oop_event_get_fd_flags(struct fd_event *fde)
 {
-       if (!fde) return 0;
-
        return fde->flags;
 }
 
@@ -152,8 +160,6 @@ static void oop_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
        oop_source_sys *oop_sys;
        oop_source *oop;
 
-       if (!fde) return;
-
        oop_sys = fde->event_ctx->additional_data;
        oop = oop_sys_source(oop_sys);
 

diff --git a/source4/lib/events/events_standard.c b/source4/lib/events/events_standard.c
index d521ffa344e154883862f7db1e1a16ff633677ae..1a3bdc1e1672c7b6295fc9a4a318b83820759a23 100644 (file)
--- a/source4/lib/events/events_standard.c
+++ b/source4/lib/events/events_standard.c
@@ -240,7 +240,7 @@ static struct fd_event *std_event_add_fd(struct event_context *ev, TALLOC_CTX *m
 */
 static uint16_t std_event_get_fd_flags(struct fd_event *fde)
 {
-       return fde?fde->flags:0;
+       return fde->flags;
 }
 
 /*
@@ -251,8 +251,7 @@ static void std_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
 #if WITH_EPOLL
        struct event_context *ev;
        struct std_event_context *std_ev;
-       if (fde == NULL || 
-           fde->flags == flags) {
+       if (fde->flags == flags) {
                return;
        }
        ev = fde->event_ctx;
@@ -267,9 +266,7 @@ static void std_event_set_fd_flags(struct fd_event *fde, uint16_t flags)
                }
        }
 #endif
-       if (fde) {
-               fde->flags = flags;
-       }
+       fde->flags = flags;
 }
 
 /*