summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Wagner <daniel.wagner@bmw-carit.de>2012-12-05 14:57:47 +0100
committerPatrik Flykt <patrik.flykt@linux.intel.com>2012-12-05 16:50:48 +0200
commit0b47fc58a28c3d8275d7ed473966ae03a3b023b2 (patch)
tree7ec3a77ade59fd99b9df2d7a77c86186f38fc08d
parent68851e84a6f2a636bc9f8d0d123e72f59bed8bfe (diff)
downloadconnman-0b47fc58a28c3d8275d7ed473966ae03a3b023b2.tar.gz
connman-0b47fc58a28c3d8275d7ed473966ae03a3b023b2.tar.bz2
connman-0b47fc58a28c3d8275d7ed473966ae03a3b023b2.zip
session: Return error code from callback
In the case the callback is directly called we can use the return value to provide it to the user.
-rw-r--r--include/session.h2
-rw-r--r--src/session.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/session.h b/include/session.h
index 4aca5d01..47d36c5c 100644
--- a/include/session.h
+++ b/include/session.h
@@ -59,7 +59,7 @@ struct connman_session_config {
GSList *allowed_bearers;
};
-typedef void (* connman_session_config_cb) (struct connman_session *session,
+typedef int (* connman_session_config_cb) (struct connman_session *session,
struct connman_session_config *config,
void *user_data, int err);
diff --git a/src/session.c b/src/session.c
index 7ffeedc3..fa6a0e96 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1618,7 +1618,7 @@ struct user_config {
GSList *allowed_bearers;
};
-static void session_create_cb(struct connman_session *session,
+static int session_create_cb(struct connman_session *session,
struct connman_session_config *config,
void *user_data, int err)
{
@@ -1696,6 +1696,8 @@ out:
}
g_free(user_config);
+
+ return err;
}
int __connman_session_create(DBusMessage *msg)