diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-14 12:17:10 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-05-14 14:30:30 +0100 |
| commit | f180a839727981c8896056a35df17768d54eada6 (patch) | |
| tree | 9a0647ea61d31d7b92afcceb2354d1fc8e5ad625 /dbus/dbus-server-unix.c | |
| parent | 084977cfe2cc232bc8b25fd7088a5a4f1a6a65d5 (diff) | |
| download | dbus-f180a839727981c8896056a35df17768d54eada6.tar.gz | |
_dbus_server_new_for_socket: raise a DBusError
This can currently only fail due to OOM, but I'm about to
make it possible to fail for other reasons.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90414
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
[smcv: correct failure to set error in one case; document @error]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'dbus/dbus-server-unix.c')
| -rw-r--r-- | dbus/dbus-server-unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index 0f67de37..5474177a 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -224,13 +224,14 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry, goto systemd_err; } - *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL); + *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL, error); if (*server_p == NULL) - goto systemd_oom; + goto systemd_err; dbus_free (fds); return DBUS_SERVER_LISTEN_OK; + systemd_oom: _DBUS_SET_OOM (error); systemd_err: @@ -336,10 +337,9 @@ _dbus_server_new_for_domain_socket (const char *path, goto failed_1; } - server = _dbus_server_new_for_socket (&listen_fd, 1, &address, 0); + server = _dbus_server_new_for_socket (&listen_fd, 1, &address, 0, error); if (server == NULL) { - dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto failed_2; } |