On Wed, Oct 05, 2016 at 11:29:22AM +0200, Pavel Grunt wrote: > Use errno to get the reason of the failure > > Resolves: > https://bugzilla.redhat.com/show_bug.cgi?id=1377100 > --- > src/virt-viewer-app.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c > index ee3800b..88328e1 100644 > --- a/src/virt-viewer-app.c > +++ b/src/virt-viewer-app.c > @@ -35,6 +35,7 @@ > #include <gio/gio.h> > #include <glib/gprintf.h> > #include <glib/gi18n.h> > +#include <errno.h> > > #ifdef HAVE_SYS_SOCKET_H > #include <sys/socket.h> > @@ -644,13 +645,14 @@ virt_viewer_app_open_tunnel_ssh(const char *sshhost, > } > > static int > -virt_viewer_app_open_unix_sock(const char *unixsock) > +virt_viewer_app_open_unix_sock(const char *unixsock, GError **error) > { > struct sockaddr_un addr; > int fd; > > if (strlen(unixsock) + 1 > sizeof(addr.sun_path)) { > - g_warning ("address is too long for unix socket_path: %s", unixsock); > + g_set_error(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, > + _("Address is too long for unix socket_path: %s"), unixsock); > return -1; > } > > @@ -658,10 +660,13 @@ virt_viewer_app_open_unix_sock(const char *unixsock) > addr.sun_family = AF_UNIX; > strcpy(addr.sun_path, unixsock); > > - if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) > + if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { > + g_set_error_literal(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, g_strerror(errno)); > return -1; > + } > > if (connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) { > + g_set_error_literal(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED, g_strerror(errno)); > close(fd); > return -1; > } If the errors are going to be presented to the user, g_strerror() is not the nicest message we can show. Acked-by: Christophe Fergeau <cfergeau@xxxxxxxxxx> Christophe
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
