diff options
| author | Pavel Březina <pbrezina@redhat.com> | 2014-12-10 19:24:58 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-01-23 21:29:17 +0100 |
| commit | 9fa95168d80beba04b333b06edc492ecb8b085a1 (patch) | |
| tree | 00071230415551a49b871f95a60f62ea392a8113 /src/monitor | |
| parent | d6ddc35574ba897cf9b5de3350086d9d8604f06f (diff) | |
| download | sssd-9fa95168d80beba04b333b06edc492ecb8b085a1.tar.gz sssd-9fa95168d80beba04b333b06edc492ecb8b085a1.tar.xz sssd-9fa95168d80beba04b333b06edc492ecb8b085a1.zip | |
sbus: add new iface via sbus_conn_register_iface()
Rename sbus_conn_add_interface() to sbus_conn_register_iface()
and remove sbus_new_interface() calls since it is just one more
unnecessary call outside the sbus code.
The function sbus_new_interface() is made static and used
directly in sbus_conn_register_iface().
The name was chosen to better describe what the function is
doing. That it registers an interface on a given object path.
The same interface can be used with different paths so it is
not really about adding an interface.
Preparation for:
https://fedorahosted.org/sssd/ticket/2339
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
Diffstat (limited to 'src/monitor')
| -rw-r--r-- | src/monitor/monitor.c | 9 | ||||
| -rw-r--r-- | src/monitor/monitor_sbus.c | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c index afefe7f11..fef1a120f 100644 --- a/src/monitor/monitor.c +++ b/src/monitor/monitor.c @@ -2443,7 +2443,6 @@ static void init_timeout(struct tevent_context *ev, */ static int monitor_service_init(struct sbus_connection *conn, void *data) { - struct sbus_interface *intf; struct mt_ctx *ctx; struct mon_init_conn *mini; struct timeval tv; @@ -2474,12 +2473,8 @@ static int monitor_service_init(struct sbus_connection *conn, void *data) return ENOMEM; } - intf = sbus_new_interface(conn, MON_SRV_PATH, &monitor_methods.vtable, mini); - if (!intf) { - return ENOMEM; - } - - return sbus_conn_add_interface(conn, intf); + return sbus_conn_register_iface(conn, &monitor_methods.vtable, + MON_SRV_PATH, mini); } /* service_send_ping diff --git a/src/monitor/monitor_sbus.c b/src/monitor/monitor_sbus.c index 3e6fbff9b..426f02997 100644 --- a/src/monitor/monitor_sbus.c +++ b/src/monitor/monitor_sbus.c @@ -172,7 +172,6 @@ errno_t sss_monitor_init(TALLOC_CTX *mem_ctx, { errno_t ret; char *sbus_address; - struct sbus_interface *intf; struct sbus_connection *conn; /* Set up SBUS connection to the monitor */ @@ -190,12 +189,7 @@ errno_t sss_monitor_init(TALLOC_CTX *mem_ctx, } talloc_free(sbus_address); - intf = sbus_new_interface(mem_ctx, MONITOR_PATH, &mon_iface->vtable, pvt); - if (!intf) { - ret = ENOMEM; - } else { - ret = sbus_conn_add_interface(conn, intf); - } + ret = sbus_conn_register_iface(conn, &mon_iface->vtable, MONITOR_PATH, pvt); if (ret != EOK) { DEBUG(SSSDBG_FATAL_FAILURE, "Failed to export monitor client.\n"); return ret; |