| Message ID | 1475064320-8517-3-git-send-email-felipe@nutanix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello, > On 28 Sep 2016, at 13:05, Felipe Franciosi <felipe@nutanix.com> wrote: > > 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> > --- > io/channel-socket.c | 3 ++- > io/channel-tls.c | 2 +- > io/channel-websock.c | 2 +- > io/channel.c | 4 ++-- > 4 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/io/channel-socket.c b/io/channel-socket.c > index 6710b2e..878fe2f 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); Oops, I tested one patch and sent another. Please disregard this series briefly. v2 coming up in a few minutes. Felipe > + 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 9a8525c..f7bb0e3 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 533bd4b..75df03e 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 923c465..e50325c 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; > -- > 1.7.1 >
diff --git a/io/channel-socket.c b/io/channel-socket.c index 6710b2e..878fe2f 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 9a8525c..f7bb0e3 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 533bd4b..75df03e 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 923c465..e50325c 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;
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> --- io/channel-socket.c | 3 ++- io/channel-tls.c | 2 +- io/channel-websock.c | 2 +- io/channel.c | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-)