diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 12:42:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-21 12:42:17 +0000 |
| commit | 3ed0b659ca810161f8222769b1f6de7c2aa54d83 (patch) | |
| tree | 18f844fdcc9fdb62662ca07e6d9dd3d71c22df6d /include/io/channel-tls.h | |
| parent | a953853ebab4b42506099156275525fc757f6c30 (diff) | |
| parent | ccf1e2dcd6091eea1fc2341c63201aa1a6094978 (diff) | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-01-20-1' into staging
I/O channels fixes 2016/01/20 v1
# gpg: Signature made Wed 20 Jan 2016 11:31:47 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-next-2016-01-20-1:
io: use memset instead of { 0 } for initializing array
io: fix description of @errp parameter initialization
io: some fixes to handling of /dev/null when running commands
io: increment counter when killing off subcommand
io: fix sign of errno value passed to error report
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/io/channel-tls.h')
| -rw-r--r-- | include/io/channel-tls.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/io/channel-tls.h b/include/io/channel-tls.h index 0298b1770e..322eccbaae 100644 --- a/include/io/channel-tls.h +++ b/include/io/channel-tls.h @@ -55,7 +55,7 @@ struct QIOChannelTLS { * @master: the underlying channel object * @creds: the credentials to use for TLS handshake * @aclname: the access control list for validating clients - * @errp: pointer to an uninitialized error object + * @errp: pointer to a NULL-initialized error object * * Create a new TLS channel that runs the server side of * a TLS session. The TLS session handshake will use the @@ -85,7 +85,7 @@ qio_channel_tls_new_server(QIOChannel *master, * @master: the underlying channel object * @creds: the credentials to use for TLS handshake * @hostname: the user specified server hostname - * @errp: pointer to an uninitialized error object + * @errp: pointer to a NULL-initialized error object * * Create a new TLS channel that runs the client side of * a TLS session. The TLS session handshake will use the |