OSDN Git Service

scanparam: Apply convention for "GSource id" like variable
authorAnderson Lizardo <anderson.lizardo@openbossa.org>
Mon, 29 Jul 2013 13:59:31 +0000 (09:59 -0400)
committerJohan Hedberg <johan.hedberg@intel.com>
Tue, 30 Jul 2013 09:50:57 +0000 (12:50 +0300)
By convention, BlueZ code checks for "Gsource id" like variables using:

if (source_id > 0)
...

Also fix the variable type to match that returned by
g_attrib_unregister().

profiles/scanparam/scan.c

index 5b9df86..ebdb7b8 100644 (file)
@@ -61,7 +61,7 @@ struct scan {
        uint16_t window;
        uint16_t iwhandle;
        uint16_t refresh_handle;
-       uint16_t refresh_cb_id;
+       guint refresh_cb_id;
 };
 
 static void write_scan_params(GAttrib *attrib, uint16_t handle)
@@ -239,7 +239,7 @@ static void scan_param_remove(struct btd_service *service)
 {
        struct scan *scan = btd_service_get_user_data(service);
 
-       if (scan->attrib != NULL && scan->refresh_cb_id)
+       if (scan->attrib != NULL && scan->refresh_cb_id > 0)
                g_attrib_unregister(scan->attrib, scan->refresh_cb_id);
 
        btd_device_remove_attio_callback(scan->device, scan->attioid);