From d68a192abc1c3a6af4c4511ed5130103d7db52c9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 18 May 2010 00:17:13 +0000 Subject: [PATCH] possibly better error checking on watch_del SVN revision: 48952 --- legacy/eeze/src/lib/udev/eeze_udev_watch.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/legacy/eeze/src/lib/udev/eeze_udev_watch.c b/legacy/eeze/src/lib/udev/eeze_udev_watch.c index ae9733487d..6a54e49919 100644 --- a/legacy/eeze/src/lib/udev/eeze_udev_watch.c +++ b/legacy/eeze/src/lib/udev/eeze_udev_watch.c @@ -265,17 +265,15 @@ EAPI void * eeze_udev_watch_del(Eeze_Udev_Watch *watch) { struct udev *udev; - struct udev_monitor *mon = watch->mon; - Ecore_Fd_Handler *handler = watch->handler; struct _store_data *sdata; void *ret; - if ((!watch) || (!mon) || (!handler)) return NULL; + if ((!watch) || (!watch->mon) || (!watch->handler)) return NULL; - udev = udev_monitor_get_udev(mon); - udev_monitor_unref(mon); - udev_unref(udev); - sdata = ecore_main_fd_handler_del(handler); + udev = udev_monitor_get_udev(watch->mon); + udev_monitor_unref(watch->mon); + udev_unref(watch->udev); + sdata = ecore_main_fd_handler_del(watch->handler); if (sdata) { ret = sdata->data;