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.

4 files changed, 14 insertions, 16 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);
 }
 
diff --git a/attrib/gatt.h b/attrib/gatt.h
index e5abd855e..0f113e7f1 100644
--- a/attrib/gatt.h
+++ b/attrib/gatt.h
@@ -53,7 +53,7 @@
 #define GATT_CLIENT_CHARAC_CFG_NOTIF_BIT	0x0001
 #define GATT_CLIENT_CHARAC_CFG_IND_BIT		0x0002
 
-typedef void (*gatt_cb_t) (GSList *l, guint8 status, gpointer user_data);
+typedef void (*gatt_cb_t) (uint8_t status, GSList *l, void *user_data);
 
 struct gatt_primary {
 	char uuid[MAX_LEN_UUID_STR + 1];
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index f211dcd2b..ebc81232a 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -137,7 +137,7 @@ static void connect_cb(GIOChannel *io, GError *err, gpointer user_data)
 	operation(attrib);
 }
 
-static void primary_all_cb(GSList *services, guint8 status, gpointer user_data)
+static void primary_all_cb(uint8_t status, GSList *services, void *user_data)
 {
 	GSList *l;
 
@@ -157,8 +157,7 @@ done:
 	g_main_loop_quit(event_loop);
 }
 
-static void primary_by_uuid_cb(GSList *ranges, guint8 status,
-							gpointer user_data)
+static void primary_by_uuid_cb(uint8_t status, GSList *ranges, void *user_data)
 {
 	GSList *l;
 
@@ -191,8 +190,8 @@ static gboolean primary(gpointer user_data)
 	return FALSE;
 }
 
-static void char_discovered_cb(GSList *characteristics, guint8 status,
-							gpointer user_data)
+static void char_discovered_cb(uint8_t status, GSList *characteristics,
+								void *user_data)
 {
 	GSList *l;
 
diff --git a/attrib/interactive.c b/attrib/interactive.c
index 5bd27afa6..9826a4bec 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -180,7 +180,7 @@ static void disconnect_io()
 	set_state(STATE_DISCONNECTED);
 }
 
-static void primary_all_cb(GSList *services, guint8 status, gpointer user_data)
+static void primary_all_cb(uint8_t status, GSList *services, void *user_data)
 {
 	GSList *l;
 
@@ -202,8 +202,7 @@ static void primary_all_cb(GSList *services, guint8 status, gpointer user_data)
 	}
 }
 
-static void primary_by_uuid_cb(GSList *ranges, guint8 status,
-							gpointer user_data)
+static void primary_by_uuid_cb(uint8_t status, GSList *ranges, void *user_data)
 {
 	GSList *l;
 
@@ -225,7 +224,7 @@ static void primary_by_uuid_cb(GSList *ranges, guint8 status,
 	}
 }
 
-static void included_cb(GSList *includes, guint8 status, gpointer user_data)
+static void included_cb(uint8_t status, GSList *includes, void *user_data)
 {
 	GSList *l;
 
@@ -249,7 +248,7 @@ static void included_cb(GSList *includes, guint8 status, gpointer user_data)
 	}
 }
 
-static void char_cb(GSList *characteristics, guint8 status, gpointer user_data)
+static void char_cb(uint8_t status, GSList *characteristics, void *user_data)
 {
 	GSList *l;