diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2010-12-14 10:51:41 +0200 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2010-12-14 10:51:41 +0200 |
| commit | 1215951d928226b5ca4c3db713553644e5c43cac (patch) | |
| tree | fca62b4a280488c3b9f9fabcd7815ab0670cff8b | |
| parent | 898e56d74905a5e55ed7ad3713308c767a49faf4 (diff) | |
| download | bluez-1215951d928226b5ca4c3db713553644e5c43cac.tar.gz | |
Use correct signess for err variable
| -rw-r--r-- | serial/port.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/serial/port.c b/serial/port.c index 1458f0618..c18889d33 100644 --- a/serial/port.c +++ b/serial/port.c @@ -245,10 +245,10 @@ static void open_notify(int fd, int err, struct serial_port *port) struct serial_device *device = port->device; DBusMessage *reply; - if (err) { + if (err < 0) { /* Max tries exceeded */ port_release(port); - reply = btd_error_failed(port->msg, strerror(err)); + reply = btd_error_failed(port->msg, strerror(-err)); } else { port->fd = fd; reply = g_dbus_create_reply(port->msg, @@ -271,7 +271,7 @@ static gboolean open_continue(gpointer user_data) fd = open(port->dev, O_RDONLY | O_NOCTTY); if (fd < 0) { - int err = errno; + int err = -errno; error("Could not open %s: %s (%d)", port->dev, strerror(err), err); if (!--ntries) { @@ -333,9 +333,9 @@ static void rfcomm_connect_cb(GIOChannel *chan, GError *conn_err, sk = g_io_channel_unix_get_fd(chan); port->id = ioctl(sk, RFCOMMCREATEDEV, &req); if (port->id < 0) { - int err = errno; - error("ioctl(RFCOMMCREATEDEV): %s (%d)", strerror(err), err); - reply = btd_error_failed(port->msg, strerror(err)); + int err = -errno; + error("ioctl(RFCOMMCREATEDEV): %s (%d)", strerror(-err), -err); + reply = btd_error_failed(port->msg, strerror(-err)); g_io_channel_shutdown(chan, TRUE, NULL); goto fail; } |