From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcN-0000sP-LI for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WgBcB-0007X1-Ab for qemu-devel@nongnu.org; Fri, 02 May 2014 07:27:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WgBcB-0007Wf-2I for qemu-devel@nongnu.org; Fri, 02 May 2014 07:26:51 -0400 From: Markus Armbruster Date: Fri, 2 May 2014 13:26:33 +0200 Message-Id: <1399030002-27222-6-git-send-email-armbru@redhat.com> In-Reply-To: <1399030002-27222-1-git-send-email-armbru@redhat.com> References: <1399030002-27222-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH v3 05/14] qga: Use return values instead of error_is_set(errp) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, mdroth@linux.vnet.ibm.com, lcapitulino@redhat.com Using error_is_set(errp) to check whether a function call failed is fragile: it breaks when errp is null. ga_get_fd_handle() and guest_file_handle_add() don't return a useful value when they fail, but that's just stupid. Fix that, and check them instead. As far as I can tell, errp can't be null there, but this is more robust and more obviously correct. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Michael Roth --- qga/commands-posix.c | 6 +++--- qga/main.c | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/qga/commands-posix.c b/qga/commands-posix.c index f6af7d1..6af974f 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -223,8 +223,8 @@ static int64_t guest_file_handle_add(FILE *fh, Error **errp) int64_t handle; handle = ga_get_fd_handle(ga_state, errp); - if (error_is_set(errp)) { - return 0; + if (handle < 0) { + return -1; } gfh = g_malloc0(sizeof(GuestFileHandle)); @@ -407,7 +407,7 @@ int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, } handle = guest_file_handle_add(fh, errp); - if (error_is_set(errp)) { + if (handle < 0) { fclose(fh); return -1; } diff --git a/qga/main.c b/qga/main.c index d838c3e..eb792a3 100644 --- a/qga/main.c +++ b/qga/main.c @@ -910,6 +910,7 @@ int64_t ga_get_fd_handle(GAState *s, Error **errp) if (!write_persistent_state(&s->pstate, s->pstate_filepath)) { error_setg(errp, "failed to commit persistent state to disk"); + return -1; } return handle; -- 1.8.1.4