The return type from g_attrib_set_destroy_function don't need to be
gboolean, it can be standard bool type.
That change implies change in its signature, which requires stdbool.h to
be included where attrib/gattrib.h is included.
---
attrib/gatt.c | 1 +
attrib/gattrib.c | 8 ++++----
attrib/gattrib.h | 4 ++--
attrib/gatttool.c | 1 +
attrib/interactive.c | 1 +
attrib/utils.c | 1 +
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/attrib/gatt.c b/attrib/gatt.c
index 749e820..3fe6aeb 100644
--- a/attrib/gatt.c
+++ b/attrib/gatt.c
@@ -28,6 +28,7 @@
#include <stdint.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <glib.h>
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>
diff --git a/attrib/gattrib.c b/attrib/gattrib.c
index 636e09d..9ca9537 100644
--- a/attrib/gattrib.c
+++ b/attrib/gattrib.c
@@ -245,16 +245,16 @@ GIOChannel *g_attrib_get_channel(GAttrib *attrib)
return attrib->io;
}
-gboolean g_attrib_set_destroy_function(GAttrib *attrib,
- GDestroyNotify destroy, gpointer user_data)
+bool g_attrib_set_destroy_function(GAttrib *attrib, GDestroyNotify destroy,
+ gpointer user_data)
{
if (attrib == NULL)
- return FALSE;
+ return false;
attrib->destroy = destroy;
attrib->destroy_user_data = user_data;
- return TRUE;
+ return true;
}
static gboolean disconnect_timeout(gpointer data)
diff --git a/attrib/gattrib.h b/attrib/gattrib.h
index 3fe92c7..9d6a1c2 100644
--- a/attrib/gattrib.h
+++ b/attrib/gattrib.h
@@ -48,8 +48,8 @@ void g_attrib_unref(GAttrib *attrib);
GIOChannel *g_attrib_get_channel(GAttrib *attrib);
-gboolean g_attrib_set_destroy_function(GAttrib *attrib,
- GDestroyNotify destroy, gpointer user_data);
+bool g_attrib_set_destroy_function(GAttrib *attrib, GDestroyNotify destroy,
+ gpointer user_data);
guint g_attrib_send(GAttrib *attrib, guint id, const guint8 *pdu, guint16 len,
GAttribResultFunc func, gpointer user_data,
diff --git a/attrib/gatttool.c b/attrib/gatttool.c
index dd0f1e2..f57cd42 100644
--- a/attrib/gatttool.c
+++ b/attrib/gatttool.c
@@ -29,6 +29,7 @@
#include <errno.h>
#include <glib.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <unistd.h>
#include <bluetooth/bluetooth.h>
diff --git a/attrib/interactive.c b/attrib/interactive.c
index a819acf..fdbdea6 100644
--- a/attrib/interactive.c
+++ b/attrib/interactive.c
@@ -28,6 +28,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/attrib/utils.c b/attrib/utils.c
index e263bcb..9966a23 100644
--- a/attrib/utils.c
+++ b/attrib/utils.c
@@ -26,6 +26,7 @@
#endif
#include <stdlib.h>
+#include <stdbool.h>
#include <glib.h>
#include <bluetooth/bluetooth.h>
--
1.8.2
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
