diff options
author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-10 09:10:36 +0000 |
---|---|---|
committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-10 09:10:36 +0000 |
commit | 47e318a6e1893069e1326945ce1af25ddf8201d1 (patch) | |
tree | aae5bbc914c095d75ce7c40712d89ac847002e00 /bus/main.c | |
parent | f3fd4d60ad5de9f0c6576f6e100f944792fed255 (diff) |
* bus/bus.c, bus/bus.h, bus/main.c, bus/test.c, dbus/dbus-sysdeps-unix.c, dbus/dbus-sysdeps-util-unix.c, dbus/dbus-sysdeps-util-win.c, bus/dbus-sysdeps-win.c,dbus/dbus-sysdeps.h: renamed _dbus_xxx_pipe to _dbus_pipe_xxx, completed _dbus_pipe support.
Diffstat (limited to 'bus/main.c')
-rw-r--r-- | bus/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -247,8 +247,8 @@ main (int argc, char **argv) DBusString addr_fd; DBusString pid_fd; const char *prev_arg; - int print_addr_fd; - int print_pid_fd; + DBusPipe print_addr_fd; + DBusPipe print_pid_fd; int i; dbus_bool_t print_address; dbus_bool_t print_pid; @@ -387,10 +387,10 @@ main (int argc, char **argv) usage (); } - print_addr_fd = -1; + print_addr_fd = _dbus_pipe_init(-1); if (print_address) { - print_addr_fd = 1; /* stdout */ + print_addr_fd = _dbus_pipe_init(1); /* stdout */ if (_dbus_string_get_length (&addr_fd) > 0) { long val; @@ -404,15 +404,15 @@ main (int argc, char **argv) exit (1); } - print_addr_fd = val; + print_addr_fd = _dbus_pipe_init(val); } } _dbus_string_free (&addr_fd); - print_pid_fd = -1; + print_pid_fd = _dbus_pipe_init(-1); if (print_pid) { - print_pid_fd = 1; /* stdout */ + print_pid_fd = _dbus_pipe_init(1); /* stdout */ if (_dbus_string_get_length (&pid_fd) > 0) { long val; @@ -426,7 +426,7 @@ main (int argc, char **argv) exit (1); } - print_pid_fd = val; + print_pid_fd = _dbus_pipe_init(val); } } _dbus_string_free (&pid_fd); |