From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X845v-0007k1-6n for qemu-devel@nongnu.org; Fri, 18 Jul 2014 05:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X845p-0004XD-Du for qemu-devel@nongnu.org; Fri, 18 Jul 2014 05:04:47 -0400 Received: from mail-qa0-x22c.google.com ([2607:f8b0:400d:c00::22c]:45704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X845p-0004X8-A6 for qemu-devel@nongnu.org; Fri, 18 Jul 2014 05:04:41 -0400 Received: by mail-qa0-f44.google.com with SMTP id f12so2811912qad.3 for ; Fri, 18 Jul 2014 02:04:39 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 18 Jul 2014 11:04:22 +0200 Message-Id: <1405674265-24058-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1405674265-24058-1-git-send-email-pbonzini@redhat.com> References: <1405674265-24058-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 3/6] module: Simplify module_load() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Andreas Färber The file path is not used for error reporting, so we can free it directly after use. Reviewed-by: Fam Zheng Signed-off-by: Andreas Färber Signed-off-by: Paolo Bonzini --- util/module.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/util/module.c b/util/module.c index 214effb..9fd3030 100644 --- a/util/module.c +++ b/util/module.c @@ -202,18 +202,16 @@ static void module_load(module_init_type type) for (i = 0; i < ARRAY_SIZE(dirs); i++) { fname = g_strdup_printf("%s/%s%s", dirs[i], *mp, HOST_DSOSUF); ret = module_load_file(fname); + g_free(fname); + fname = NULL; /* Try loading until loaded a module file */ if (!ret) { break; } - g_free(fname); - fname = NULL; } if (ret == -ENOENT) { fprintf(stderr, "Can't find module: %s\n", *mp); } - - g_free(fname); } for (i = 0; i < ARRAY_SIZE(dirs); i++) { -- 1.9.3