From d6890b721de8cc7b193784552851e8f093425167 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sat, 2 Jan 1999 07:32:22 +0000 Subject: [PATCH] Removed features.h test. * configure.in, config.h.in, gdk/gdkimage.c: Removed features.h test. * gdk/gdkdnd.c: Guard public functions against NULL pointer derefs. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ config.h.in | 3 --- configure.in | 2 -- gdk/gdkdnd.c | 28 ++++++++++++++++++++++------ gdk/gdkimage.c | 3 --- gdk/x11/gdkdnd-x11.c | 28 ++++++++++++++++++++++------ gdk/x11/gdkimage-x11.c | 3 --- 13 files changed, 100 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a81e3e226..1af03da210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a81e3e226..1af03da210 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +1999-01-02 Jeff Garzik + + * configure.in, config.h.in, gdk/gdkimage.c: + Removed features.h test. + + * gdk/gdkdnd.c: + Guard public functions against NULL pointer derefs. + Fri Jan 1 18:41:09 PST 1999 Manish Singh * gdk/gdk.c diff --git a/config.h.in b/config.h.in index f7d9c6c75a..600d96c43a 100644 --- a/config.h.in +++ b/config.h.in @@ -121,9 +121,6 @@ /* Define if you have the header file. */ #undef HAVE_ARGZ_H -/* Define if you have the header file. */ -#undef HAVE_FEATURES_H - /* Define if you have the header file. */ #undef HAVE_LIMITS_H diff --git a/configure.in b/configure.in index 0e1765c8f6..2a4c8207f1 100644 --- a/configure.in +++ b/configure.in @@ -315,8 +315,6 @@ AC_SUBST(x_ldflags) AC_SUBST(x_libs) AC_SUBST(xinput_progs) -AC_CHECK_HEADERS(features.h) - if test "x$enable_shm" = "xyes"; then # Check for shared memory AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes) diff --git a/gdk/gdkdnd.c b/gdk/gdkdnd.c index 0578a81089..3cd5effbf7 100644 --- a/gdk/gdkdnd.c +++ b/gdk/gdkdnd.c @@ -122,6 +122,8 @@ gdk_drag_context_new (void) void gdk_drag_context_ref (GdkDragContext *context) { + g_return_if_fail (context != NULL); + ((GdkDragContextPrivate *)context)->ref_count++; } @@ -131,6 +133,8 @@ gdk_drag_context_unref (GdkDragContext *context) GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; private->ref_count--; + g_return_if_fail (context != NULL); + if (private->ref_count == 0) { g_dataset_destroy (private); @@ -157,10 +161,11 @@ gdk_drag_context_find (gboolean is_source, Window dest_xid) { GList *tmp_list = contexts; + GdkDragContext *context; while (tmp_list) { - GdkDragContext *context = (GdkDragContext *)tmp_list->data; + context = (GdkDragContext *)tmp_list->data; if ((!context->is_source == !is_source) && ((source_xid == None) || (context->source_window && @@ -458,7 +463,7 @@ get_client_window_at_coords_recurse (Window win, return None; } -Window +static Window get_client_window_at_coords (GdkWindowCache *cache, Window ignore, gint x_root, @@ -550,7 +555,7 @@ get_client_window_at_coords_recurse (Window win, return None; } -Window +static Window get_client_window_at_coords (Window ignore, gint x_root, gint y_root) @@ -2550,6 +2555,8 @@ gdk_drag_find_window (GdkDragContext *context, GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; Window dest; + g_return_if_fail (context != NULL); + if (!private->window_cache) private->window_cache = gdk_window_cache_new(); @@ -2596,6 +2603,8 @@ gdk_drag_motion (GdkDragContext *context, { GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; + g_return_val_if_fail (context != NULL, FALSE); + if (context->dest_window != dest_window) { GdkEvent temp_event; @@ -2707,6 +2716,8 @@ void gdk_drag_drop (GdkDragContext *context, guint32 time) { + g_return_if_fail (context != NULL); + if (context->dest_window) { switch (context->protocol) @@ -2731,6 +2742,8 @@ void gdk_drag_abort (GdkDragContext *context, guint32 time) { + g_return_if_fail (context != NULL); + gdk_drag_do_leave (context, time); } @@ -2744,7 +2757,7 @@ gdk_drag_status (GdkDragContext *context, GdkDragContextPrivate *private; XEvent xev; - g_return_if_fail (context != 0); + g_return_if_fail (context != NULL); private = (GdkDragContextPrivate *)context; @@ -2837,7 +2850,7 @@ gdk_drop_reply (GdkDragContext *context, { GdkDragContextPrivate *private; - g_return_if_fail (context != 0); + g_return_if_fail (context != NULL); private = (GdkDragContextPrivate *)context; @@ -2874,6 +2887,8 @@ gdk_drop_finish (GdkDragContext *context, gboolean success, guint32 time) { + g_return_if_fail (context != NULL); + if (context->protocol == GDK_DRAG_PROTO_XDND) { XEvent xev; @@ -2902,9 +2917,10 @@ void gdk_window_register_dnd (GdkWindow *window) { static guint32 xdnd_version = 3; - MotifDragReceiverInfo info; + g_return_if_fail (window != NULL); + /* Set Motif drag receiver information property */ if (!motif_drag_receiver_info_atom) diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c index 81bfb7648f..3c5cfe9b0f 100644 --- a/gdk/gdkimage.c +++ b/gdk/gdkimage.c @@ -25,9 +25,6 @@ #ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 1 #endif -#ifdef HAVE_FEATURES_H -# include -#endif #include #include diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c index 0578a81089..3cd5effbf7 100644 --- a/gdk/x11/gdkdnd-x11.c +++ b/gdk/x11/gdkdnd-x11.c @@ -122,6 +122,8 @@ gdk_drag_context_new (void) void gdk_drag_context_ref (GdkDragContext *context) { + g_return_if_fail (context != NULL); + ((GdkDragContextPrivate *)context)->ref_count++; } @@ -131,6 +133,8 @@ gdk_drag_context_unref (GdkDragContext *context) GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; private->ref_count--; + g_return_if_fail (context != NULL); + if (private->ref_count == 0) { g_dataset_destroy (private); @@ -157,10 +161,11 @@ gdk_drag_context_find (gboolean is_source, Window dest_xid) { GList *tmp_list = contexts; + GdkDragContext *context; while (tmp_list) { - GdkDragContext *context = (GdkDragContext *)tmp_list->data; + context = (GdkDragContext *)tmp_list->data; if ((!context->is_source == !is_source) && ((source_xid == None) || (context->source_window && @@ -458,7 +463,7 @@ get_client_window_at_coords_recurse (Window win, return None; } -Window +static Window get_client_window_at_coords (GdkWindowCache *cache, Window ignore, gint x_root, @@ -550,7 +555,7 @@ get_client_window_at_coords_recurse (Window win, return None; } -Window +static Window get_client_window_at_coords (Window ignore, gint x_root, gint y_root) @@ -2550,6 +2555,8 @@ gdk_drag_find_window (GdkDragContext *context, GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; Window dest; + g_return_if_fail (context != NULL); + if (!private->window_cache) private->window_cache = gdk_window_cache_new(); @@ -2596,6 +2603,8 @@ gdk_drag_motion (GdkDragContext *context, { GdkDragContextPrivate *private = (GdkDragContextPrivate *)context; + g_return_val_if_fail (context != NULL, FALSE); + if (context->dest_window != dest_window) { GdkEvent temp_event; @@ -2707,6 +2716,8 @@ void gdk_drag_drop (GdkDragContext *context, guint32 time) { + g_return_if_fail (context != NULL); + if (context->dest_window) { switch (context->protocol) @@ -2731,6 +2742,8 @@ void gdk_drag_abort (GdkDragContext *context, guint32 time) { + g_return_if_fail (context != NULL); + gdk_drag_do_leave (context, time); } @@ -2744,7 +2757,7 @@ gdk_drag_status (GdkDragContext *context, GdkDragContextPrivate *private; XEvent xev; - g_return_if_fail (context != 0); + g_return_if_fail (context != NULL); private = (GdkDragContextPrivate *)context; @@ -2837,7 +2850,7 @@ gdk_drop_reply (GdkDragContext *context, { GdkDragContextPrivate *private; - g_return_if_fail (context != 0); + g_return_if_fail (context != NULL); private = (GdkDragContextPrivate *)context; @@ -2874,6 +2887,8 @@ gdk_drop_finish (GdkDragContext *context, gboolean success, guint32 time) { + g_return_if_fail (context != NULL); + if (context->protocol == GDK_DRAG_PROTO_XDND) { XEvent xev; @@ -2902,9 +2917,10 @@ void gdk_window_register_dnd (GdkWindow *window) { static guint32 xdnd_version = 3; - MotifDragReceiverInfo info; + g_return_if_fail (window != NULL); + /* Set Motif drag receiver information property */ if (!motif_drag_receiver_info_atom) diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index 81bfb7648f..3c5cfe9b0f 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -25,9 +25,6 @@ #ifndef _XOPEN_SOURCE # define _XOPEN_SOURCE 1 #endif -#ifdef HAVE_FEATURES_H -# include -#endif #include #include