diff options
Diffstat (limited to 'bus')
| -rw-r--r-- | bus/bus.c | 8 | ||||
| -rw-r--r-- | bus/main.c | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -630,7 +630,7 @@ bus_context_new (const DBusString *config_file, } bytes = _dbus_string_get_length (&addr); - if (_dbus_write (print_addr_fd, &addr, 0, bytes) != bytes) + if (_dbus_write_socket (print_addr_fd, &addr, 0, bytes) != bytes) { dbus_set_error (error, DBUS_ERROR_FAILED, "Printing message bus address: %s\n", @@ -640,7 +640,7 @@ bus_context_new (const DBusString *config_file, } if (print_addr_fd > 2) - _dbus_close (print_addr_fd, NULL); + _dbus_close_socket (print_addr_fd, NULL); _dbus_string_free (&addr); } @@ -731,7 +731,7 @@ bus_context_new (const DBusString *config_file, } bytes = _dbus_string_get_length (&pid); - if (_dbus_write (print_pid_fd, &pid, 0, bytes) != bytes) + if (_dbus_write_socket (print_pid_fd, &pid, 0, bytes) != bytes) { dbus_set_error (error, DBUS_ERROR_FAILED, "Printing message bus PID: %s\n", @@ -741,7 +741,7 @@ bus_context_new (const DBusString *config_file, } if (print_pid_fd > 2) - _dbus_close (print_pid_fd, NULL); + _dbus_close_socket (print_pid_fd, NULL); _dbus_string_free (&pid); } @@ -51,7 +51,7 @@ signal_handler (int sig) #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */ case SIGHUP: _dbus_string_init_const (&str, "foo"); - if (!_dbus_write (reload_pipe[RELOAD_WRITE_END], &str, 0, 1)) + if (!_dbus_write_socket (reload_pipe[RELOAD_WRITE_END], &str, 0, 1)) { _dbus_warn ("Unable to write to reload pipe.\n"); exit (1); @@ -150,7 +150,7 @@ handle_reload_watch (DBusWatch *watch, DBusError error; DBusString str; _dbus_string_init (&str); - if (_dbus_read (reload_pipe[RELOAD_READ_END], &str, 1) != 1) + if (_dbus_read_socket (reload_pipe[RELOAD_READ_END], &str, 1) != 1) { _dbus_warn ("Couldn't read from reload pipe.\n"); exit (1); |