From e24161f526df7336e5a2d32f0d395a4746f364cd Mon Sep 17 00:00:00 2001
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Date: Fri, 14 Sep 2012 13:15:10 +0300
Subject: [PATCH] obexd: Unify callbacks for operations that only report status

This removes duplicated code.
---
 obexd/plugins/mas.c            | 16 +---------------
 obexd/plugins/messages-dummy.c |  7 +++----
 obexd/plugins/messages.h       | 16 +++++-----------
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/obexd/plugins/mas.c b/obexd/plugins/mas.c
index 8105413d3..186d26712 100644
--- a/obexd/plugins/mas.c
+++ b/obexd/plugins/mas.c
@@ -488,20 +488,6 @@ proceed:
 		obex_object_set_io_flags(mas, G_IO_IN, err);
 }
 
-static void update_inbox_cb(void *session, int err, void *user_data)
-{
-	struct mas_session *mas = user_data;
-
-	DBG("");
-
-	mas->finished = TRUE;
-
-	if (err < 0)
-		obex_object_set_io_flags(mas, G_IO_ERR, err);
-	else
-		obex_object_set_io_flags(mas, G_IO_OUT, 0);
-}
-
 static void set_status_cb(void *session, int err, void *user_data)
 {
 	struct mas_session *mas = user_data;
@@ -659,7 +645,7 @@ static void *message_update_open(const char *name, int oflag, mode_t mode,
 		return NULL;
 	}
 
-	*err = messages_update_inbox(mas->backend_data, update_inbox_cb, mas);
+	*err = messages_update_inbox(mas->backend_data, set_status_cb, mas);
 	if (*err < 0)
 		return NULL;
 	else
diff --git a/obexd/plugins/messages-dummy.c b/obexd/plugins/messages-dummy.c
index e498784c5..4c66f51bb 100644
--- a/obexd/plugins/messages-dummy.c
+++ b/obexd/plugins/messages-dummy.c
@@ -347,21 +347,20 @@ int messages_get_message(void *session, const char *handle,
 	return -ENOSYS;
 }
 
-int messages_update_inbox(void *session, messages_update_inbox_cb callback,
+int messages_update_inbox(void *session, messages_status_cb callback,
 							void *user_data)
 {
 	return -ENOSYS;
 }
 
 int messages_set_read(void *session, const char *handle, uint8_t value,
-				messages_set_read_cb callback, void *user_data)
+				messages_status_cb callback, void *user_data)
 {
 	return -ENOSYS;
 }
 
 int messages_set_delete(void *session, const char *handle, uint8_t value,
-					messages_set_delete_cb callback,
-					void *user_data)
+				messages_status_cb callback, void *user_data)
 {
 	return -ENOSYS;
 }
diff --git a/obexd/plugins/messages.h b/obexd/plugins/messages.h
index a514514ba..00a16b1ae 100644
--- a/obexd/plugins/messages.h
+++ b/obexd/plugins/messages.h
@@ -268,16 +268,15 @@ int messages_get_message(void *session, const char *handle,
 					messages_get_message_cb callback,
 					void *user_data);
 
+typedef void (*messages_status_cb)(void *session, int err, void *user_data);
+
 /* Informs Message Server to Update Inbox via network.
  *
  * session: Backend session.
  * user_data: User data if any to be sent.
  * Callback shall be called for every update inbox request received from MCE.
  */
-typedef void (*messages_update_inbox_cb)(void *session, int err,
-							void *user_data);
-
-int messages_update_inbox(void *session, messages_update_inbox_cb callback,
+int messages_update_inbox(void *session, messages_status_cb callback,
 							void *user_data);
 /* Informs Message Server to modify read status of a given message.
  *
@@ -288,10 +287,8 @@ int messages_update_inbox(void *session, messages_update_inbox_cb callback,
  *	recieved from MCE.
  * user_data: User data if any to be sent.
  */
-typedef void (*messages_set_read_cb)(void *session, int err, void *user_data);
-
 int messages_set_read(void *session, const char *handle, uint8_t value,
-				messages_set_read_cb callback, void *user_data);
+				messages_status_cb callback, void *user_data);
 
 /* Informs Message Server to modify delete status of a given message.
  *
@@ -302,11 +299,8 @@ int messages_set_read(void *session, const char *handle, uint8_t value,
  *	recieved from MCE.
  * user_data: User data if any to be sent.
  */
-typedef void (*messages_set_delete_cb)(void *session, int err, void *user_data);
-
 int messages_set_delete(void *session, const char *handle, uint8_t value,
-					messages_set_delete_cb callback,
-					void *user_data);
+				messages_status_cb callback, void *user_data);
 
 /* Aborts currently pending request.
  *
-- 
2.47.3