diff options
| author | Felipe Franciosi <felipe@nutanix.com> | 2016-09-29 08:52:36 -0700 |
|---|---|---|
| committer | Daniel P. Berrange <berrange@redhat.com> | 2016-10-26 18:19:53 +0200 |
| commit | e413ae0c0492c10d9277a1155ecc21fbbf0e2bc7 (patch) | |
| tree | 3f1fbda4a2ed68545f632380e6b1864bbac06b00 | |
| parent | 8fbf66121253969e59fe40de66e55bb2f27c5090 (diff) | |
io: Use qio_channel_has_feature() where applicable
Parts of the code have been testing QIOChannel features directly with a
logical AND. This patch makes it all consistent by using the
qio_channel_has_feature() function to test if a feature is present.
Signed-off-by: Felipe Franciosi <felipe@nutanix.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
| -rw-r--r-- | io/channel-socket.c | 3 | ||||
| -rw-r--r-- | io/channel-tls.c | 2 | ||||
| -rw-r--r-- | io/channel-websock.c | 2 | ||||
| -rw-r--r-- | io/channel.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/io/channel-socket.c b/io/channel-socket.c index 6710b2ee96..8fc6e5aaaa 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -403,7 +403,8 @@ static void qio_channel_socket_finalize(Object *obj) QIOChannelSocket *ioc = QIO_CHANNEL_SOCKET(obj); if (ioc->fd != -1) { - if (QIO_CHANNEL(ioc)->features & (1 << QIO_CHANNEL_FEATURE_LISTEN)) { + QIOChannel *ioc_local = QIO_CHANNEL(ioc); + if (qio_channel_has_feature(ioc_local, QIO_CHANNEL_FEATURE_LISTEN)) { Error *err = NULL; socket_listen_cleanup(ioc->fd, &err); diff --git a/io/channel-tls.c b/io/channel-tls.c index 9a8525c816..f7bb0e3698 100644 --- a/io/channel-tls.c +++ b/io/channel-tls.c @@ -111,7 +111,7 @@ qio_channel_tls_new_client(QIOChannel *master, ioc = QIO_CHANNEL(tioc); tioc->master = master; - if (master->features & (1 << QIO_CHANNEL_FEATURE_SHUTDOWN)) { + if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) { ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN); } object_ref(OBJECT(master)); diff --git a/io/channel-websock.c b/io/channel-websock.c index 533bd4b3b5..75df03ef29 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -497,7 +497,7 @@ qio_channel_websock_new_server(QIOChannel *master) ioc = QIO_CHANNEL(wioc); wioc->master = master; - if (master->features & (1 << QIO_CHANNEL_FEATURE_SHUTDOWN)) { + if (qio_channel_has_feature(master, QIO_CHANNEL_FEATURE_SHUTDOWN)) { ioc->features |= (1 << QIO_CHANNEL_FEATURE_SHUTDOWN); } object_ref(OBJECT(master)); diff --git a/io/channel.c b/io/channel.c index 923c4651ca..e50325c3f7 100644 --- a/io/channel.c +++ b/io/channel.c @@ -40,7 +40,7 @@ ssize_t qio_channel_readv_full(QIOChannel *ioc, QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); if ((fds || nfds) && - !(ioc->features & (1 << QIO_CHANNEL_FEATURE_FD_PASS))) { + !qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS)) { error_setg_errno(errp, EINVAL, "Channel does not support file descriptor passing"); return -1; @@ -60,7 +60,7 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); if ((fds || nfds) && - !(ioc->features & (1 << QIO_CHANNEL_FEATURE_FD_PASS))) { + !qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_FD_PASS)) { error_setg_errno(errp, EINVAL, "Channel does not support file descriptor passing"); return -1; |