diff options
| author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2014-01-11 00:47:17 -0400 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@intel.com> | 2014-01-11 18:56:03 +0200 |
| commit | 2704b4c83bad1445ab237cad5de204d7166ae616 (patch) | |
| tree | c319d97ce2990f248d81d54eb58928f168edd68c /attrib/gatt.c | |
| parent | d45c6df38652385c8ff5a9318a5eedfbefc64cf1 (diff) | |
| download | bluez-2704b4c83bad1445ab237cad5de204d7166ae616.tar.gz | |
attrib: Modify gatt_cb_t signature
Use standard C types instead of GLib ones (which are unnecessary here)
and move the "status" parameter to the first position, so it is
consistent with other callbacks.
Diffstat (limited to 'attrib/gatt.c')
| -rw-r--r-- | attrib/gatt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/attrib/gatt.c b/attrib/gatt.c index bb2cae137..9ed588beb 100644 --- a/attrib/gatt.c +++ b/attrib/gatt.c @@ -90,9 +90,9 @@ static void isd_unref(struct included_discovery *isd) return; if (isd->err) - isd->cb(NULL, isd->err, isd->user_data); + isd->cb(isd->err, NULL, isd->user_data); else - isd->cb(isd->includes, isd->err, isd->user_data); + isd->cb(isd->err, isd->includes, isd->user_data); g_slist_free_full(isd->includes, g_free); g_attrib_unref(isd->attrib); @@ -183,7 +183,7 @@ static void primary_by_uuid_cb(guint8 status, const guint8 *ipdu, return; done: - dp->cb(dp->primaries, err, dp->user_data); + dp->cb(err, dp->primaries, dp->user_data); discover_primary_free(dp); } @@ -252,7 +252,7 @@ static void primary_all_cb(guint8 status, const guint8 *ipdu, guint16 iplen, } done: - dp->cb(dp->primaries, err, dp->user_data); + dp->cb(err, dp->primaries, dp->user_data); discover_primary_free(dp); } @@ -517,7 +517,7 @@ static void char_discovered_cb(guint8 status, const guint8 *ipdu, guint16 iplen, done: err = (dc->characteristics ? 0 : err); - dc->cb(dc->characteristics, err, dc->user_data); + dc->cb(err, dc->characteristics, dc->user_data); discover_char_free(dc); } |