summaryrefslogtreecommitdiff
path: root/src/rfkill.c
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2010-01-18 21:01:44 -0800
committerMarcel Holtmann <marcel@holtmann.org>2010-01-18 21:01:44 -0800
commite35e36efd75a9cd8f2f28e5403125f77b25726ce (patch)
tree712f4c557f3d2f2f6cd76b48699ba76f8d0065a3 /src/rfkill.c
parentcfda513e5e25808537e362dd208716ed80cf6d63 (diff)
downloadconnman-e35e36efd75a9cd8f2f28e5403125f77b25726ce.tar.gz
connman-e35e36efd75a9cd8f2f28e5403125f77b25726ce.tar.bz2
connman-e35e36efd75a9cd8f2f28e5403125f77b25726ce.zip
Some minor style fixing for the previous commit
Diffstat (limited to 'src/rfkill.c')
-rw-r--r--src/rfkill.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/rfkill.c b/src/rfkill.c
index fd38db92..f68ee0eb 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -101,13 +101,10 @@ static GIOStatus rfkill_process(GIOChannel *chan)
static gboolean rfkill_event(GIOChannel *chan,
GIOCondition cond, gpointer data)
{
- GIOStatus status;
-
if (cond & (G_IO_NVAL | G_IO_HUP | G_IO_ERR))
return FALSE;
- status = rfkill_process(chan);
- if (status == G_IO_STATUS_ERROR)
+ if (rfkill_process(chan) == G_IO_STATUS_ERROR)
return FALSE;
return TRUE;
@@ -136,8 +133,7 @@ int __connman_rfkill_init(void)
g_io_channel_set_flags(channel, flags, NULL);
/* Process current RFKILL events sent on device open */
- while (rfkill_process(channel) == G_IO_STATUS_NORMAL)
- ;
+ while (rfkill_process(channel) == G_IO_STATUS_NORMAL);
g_io_add_watch(channel, G_IO_IN | G_IO_NVAL | G_IO_HUP | G_IO_ERR,
rfkill_event, NULL);