| Message ID | 20191011160552.22907-10-vsementsov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | error: auto propagated local_err | expand |
On Fri, 11 Oct 2019 19:03:55 +0300 Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> wrote: > Make error_append_security_model_hint and > error_append_socket_sockfd_hint hint append helpers well formed: > rename errp to errp_in, as it is IN-parameter here (which is unusual > for errp). > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- Acked-by: Greg Kurz <groug@kaod.org> > hw/9pfs/9p-local.c | 4 ++-- > hw/9pfs/9p-proxy.c | 5 +++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index 08e673a79c..35635e7e7e 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -1469,9 +1469,9 @@ static void local_cleanup(FsContext *ctx) > g_free(data); > } > > -static void error_append_security_model_hint(Error **errp) > +static void error_append_security_model_hint(Error **errp_in) > { > - error_append_hint(errp, "Valid options are: security_model=" > + error_append_hint(errp_in, "Valid options are: security_model=" > "[passthrough|mapped-xattr|mapped-file|none]\n"); > } > > diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c > index 57a8c1c808..0cea8b19fa 100644 > --- a/hw/9pfs/9p-proxy.c > +++ b/hw/9pfs/9p-proxy.c > @@ -1114,9 +1114,10 @@ static int connect_namedsocket(const char *path, Error **errp) > return sockfd; > } > > -static void error_append_socket_sockfd_hint(Error **errp) > +static void error_append_socket_sockfd_hint(Error **errp_in) > { > - error_append_hint(errp, "Either specify socket=/some/path where /some/path" > + error_append_hint(errp_in, > + "Either specify socket=/some/path where /some/path" > " points to a listening AF_UNIX socket or sock_fd=fd" > " where fd is a file descriptor to a connected AF_UNIX" > " socket\n");
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 08e673a79c..35635e7e7e 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1469,9 +1469,9 @@ static void local_cleanup(FsContext *ctx) g_free(data); } -static void error_append_security_model_hint(Error **errp) +static void error_append_security_model_hint(Error **errp_in) { - error_append_hint(errp, "Valid options are: security_model=" + error_append_hint(errp_in, "Valid options are: security_model=" "[passthrough|mapped-xattr|mapped-file|none]\n"); } diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c index 57a8c1c808..0cea8b19fa 100644 --- a/hw/9pfs/9p-proxy.c +++ b/hw/9pfs/9p-proxy.c @@ -1114,9 +1114,10 @@ static int connect_namedsocket(const char *path, Error **errp) return sockfd; } -static void error_append_socket_sockfd_hint(Error **errp) +static void error_append_socket_sockfd_hint(Error **errp_in) { - error_append_hint(errp, "Either specify socket=/some/path where /some/path" + error_append_hint(errp_in, + "Either specify socket=/some/path where /some/path" " points to a listening AF_UNIX socket or sock_fd=fd" " where fd is a file descriptor to a connected AF_UNIX" " socket\n");
Make error_append_security_model_hint and error_append_socket_sockfd_hint hint append helpers well formed: rename errp to errp_in, as it is IN-parameter here (which is unusual for errp). Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- hw/9pfs/9p-local.c | 4 ++-- hw/9pfs/9p-proxy.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)