sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r12123: handle fde == NULL at the correct level

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2005-12-08 08:31:59 +00:00 committed by Gerald (Jerry) Carter
parent 2ea8e61f23
commit 1dd5bb60a5
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/gtk/common/gtk_events.c
View File

@ -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)

2
source/lib/events/events.c
View File

@ -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);
}

16
source/lib/events/events_liboop.c
View File

@ -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);

9
source/lib/events/events_standard.c
View File

@ -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;
}
/*