From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnYG-0002SJ-QR for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:44:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TdnYF-00024D-Is for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:44:08 -0500 Received: from mail-ie0-f173.google.com ([209.85.223.173]:58660) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TdnYF-000249-CE for qemu-devel@nongnu.org; Wed, 28 Nov 2012 14:44:07 -0500 Received: by mail-ie0-f173.google.com with SMTP id e13so10135622iej.4 for ; Wed, 28 Nov 2012 11:44:07 -0800 (PST) Sender: fluxion Date: Wed, 28 Nov 2012 13:43:13 -0600 From: mdroth Message-ID: <20121128194313.GJ8690@vm> References: <1354021324-31561-1-git-send-email-lcapitulino@redhat.com> <1354021324-31561-9-git-send-email-lcapitulino@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1354021324-31561-9-git-send-email-lcapitulino@redhat.com> Subject: Re: [Qemu-devel] [PATCH 08/10] qemu-ga: qmp_guest_network_get_interfaces(): get rid of snprintf() + error_set() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: qemu-devel@nongnu.org On Tue, Nov 27, 2012 at 11:02:02AM -0200, Luiz Capitulino wrote: > Convert them to error_setg_errno(). > > Signed-off-by: Luiz Capitulino Reviewed-by: Michael Roth > --- > qga/commands-posix.c | 29 ++++++++--------------------- > 1 file changed, 8 insertions(+), 21 deletions(-) > > diff --git a/qga/commands-posix.c b/qga/commands-posix.c > index 72ef8ba..c399f02 100644 > --- a/qga/commands-posix.c > +++ b/qga/commands-posix.c > @@ -802,12 +802,9 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > { > GuestNetworkInterfaceList *head = NULL, *cur_item = NULL; > struct ifaddrs *ifap, *ifa; > - char err_msg[512]; > > if (getifaddrs(&ifap) < 0) { > - snprintf(err_msg, sizeof(err_msg), > - "getifaddrs failed: %s", strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, "getifaddrs failed"); > goto error; > } > > @@ -843,20 +840,16 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > /* we haven't obtained HW address yet */ > sock = socket(PF_INET, SOCK_STREAM, 0); > if (sock == -1) { > - snprintf(err_msg, sizeof(err_msg), > - "failed to create socket: %s", strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, "failed to create socket"); > goto error; > } > > memset(&ifr, 0, sizeof(ifr)); > pstrcpy(ifr.ifr_name, IF_NAMESIZE, info->value->name); > if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { > - snprintf(err_msg, sizeof(err_msg), > - "failed to get MAC address of %s: %s", > - ifa->ifa_name, > - strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, > + "failed to get MAC address of %s", > + ifa->ifa_name); > goto error; > } > > @@ -867,9 +860,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > (int) mac_addr[0], (int) mac_addr[1], > (int) mac_addr[2], (int) mac_addr[3], > (int) mac_addr[4], (int) mac_addr[5]) == -1) { > - snprintf(err_msg, sizeof(err_msg), > - "failed to format MAC: %s", strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, "failed to format MAC"); > goto error; > } > > @@ -884,9 +875,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > address_item->value = g_malloc0(sizeof(*address_item->value)); > p = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; > if (!inet_ntop(AF_INET, p, addr4, sizeof(addr4))) { > - snprintf(err_msg, sizeof(err_msg), > - "inet_ntop failed : %s", strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, "inet_ntop failed"); > goto error; > } > > @@ -906,9 +895,7 @@ GuestNetworkInterfaceList *qmp_guest_network_get_interfaces(Error **errp) > address_item->value = g_malloc0(sizeof(*address_item->value)); > p = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr; > if (!inet_ntop(AF_INET6, p, addr6, sizeof(addr6))) { > - snprintf(err_msg, sizeof(err_msg), > - "inet_ntop failed : %s", strerror(errno)); > - error_set(errp, QERR_QGA_COMMAND_FAILED, err_msg); > + error_setg_errno(errp, errno, "inet_ntop failed"); > goto error; > } > > -- > 1.8.0 >