diff options
author | Simo Sorce <ssorce@redhat.com> | 2009-08-05 06:51:07 -0400 |
---|---|---|
committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-08-10 09:42:19 -0400 |
commit | 0c7050d8569ce7ee61b13d02b4733249a11e171f (patch) | |
tree | ab51d15a42dd2049d5a55eed8dbd79945e119050 /server/sbus/sssd_dbus_server.c | |
parent | 2b0f40eaba44742fa38bb5b67ada510e7b2b6324 (diff) | |
download | sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.gz sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.tar.bz2 sssd-0c7050d8569ce7ee61b13d02b4733249a11e171f.zip |
Cosmetic changes
Rationalize and rename connection names in preparatoin for merging of server and
connection structures.
Diffstat (limited to 'server/sbus/sssd_dbus_server.c')
-rw-r--r-- | server/sbus/sssd_dbus_server.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/sbus/sssd_dbus_server.c b/server/sbus/sssd_dbus_server.c index 6df004d3..5c247fcc 100644 --- a/server/sbus/sssd_dbus_server.c +++ b/server/sbus/sssd_dbus_server.c @@ -53,11 +53,11 @@ static int sbus_server_destructor(void *ctx); * dbus_connection_close() */ static void sbus_server_init_new_connection(DBusServer *dbus_server, - DBusConnection *conn, + DBusConnection *dbus_conn, void *data) { struct sbus_srv_ctx *srv_ctx; - struct sbus_conn_ctx *conn_ctx; + struct sbus_connection *conn; struct sbus_method_ctx *iter; int ret; @@ -68,22 +68,22 @@ static void sbus_server_init_new_connection(DBusServer *dbus_server, } DEBUG(5,("Adding connection %lX.\n", conn)); - ret = sbus_add_connection(srv_ctx, srv_ctx->ev, conn, - &conn_ctx, SBUS_CONN_TYPE_PRIVATE); + ret = sbus_add_connection(srv_ctx, srv_ctx->ev, dbus_conn, + &conn, SBUS_CONN_TYPE_PRIVATE); if (ret != 0) { - dbus_connection_close(conn); + dbus_connection_close(dbus_conn); DEBUG(5,("Closing connection (failed setup)")); return; } - dbus_connection_ref(conn); + dbus_connection_ref(dbus_conn); DEBUG(5,("Got a connection\n")); /* Set up global methods */ iter = srv_ctx->sd_ctx; while (iter != NULL) { - sbus_conn_add_method_ctx(conn_ctx, iter); + sbus_conn_add_method_ctx(conn, iter); iter = iter->next; } @@ -95,7 +95,7 @@ static void sbus_server_init_new_connection(DBusServer *dbus_server, * This function (or its callbacks) should also * set up connection-specific methods. */ - ret = srv_ctx->init_fn(conn_ctx, srv_ctx->init_pvt_data); + ret = srv_ctx->init_fn(conn, srv_ctx->init_pvt_data); if (ret != EOK) { DEBUG(1,("Initialization failed!\n")); } |