From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X73LR-0005Ca-DB for qemu-devel@nongnu.org; Tue, 15 Jul 2014 10:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X73LJ-0003PW-Od for qemu-devel@nongnu.org; Tue, 15 Jul 2014 10:04:37 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33999 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X73LJ-0003Oy-Hx for qemu-devel@nongnu.org; Tue, 15 Jul 2014 10:04:29 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 15 Jul 2014 16:04:25 +0200 Message-Id: <1405433066-4337-2-git-send-email-afaerber@suse.de> In-Reply-To: <1405433066-4337-1-git-send-email-afaerber@suse.de> References: <1405433066-4337-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-2.1 1/2] module: Simplify module_load() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, famz@redhat.com, mjt@tls.msk.ru, brogers@suse.com, pbonzini@redhat.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= The file path is not used for error reporting, so we can free it directly after use. Signed-off-by: Andreas F=C3=A4rber --- 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 =3D 0; i < ARRAY_SIZE(dirs); i++) { fname =3D g_strdup_printf("%s/%s%s", dirs[i], *mp, HOST_DSOS= UF); ret =3D module_load_file(fname); + g_free(fname); + fname =3D NULL; /* Try loading until loaded a module file */ if (!ret) { break; } - g_free(fname); - fname =3D NULL; } if (ret =3D=3D -ENOENT) { fprintf(stderr, "Can't find module: %s\n", *mp); } - - g_free(fname); } =20 for (i =3D 0; i < ARRAY_SIZE(dirs); i++) { --=20 1.8.4.5