From nobody Sun May 5 16:42:45 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488682630787955.2225978261903; Sat, 4 Mar 2017 18:57:10 -0800 (PST) Received: from localhost ([::1]:37343 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckMM7-0003RD-CL for importer@patchew.org; Sat, 04 Mar 2017 21:57:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ckMLT-0003R5-DW for qemu-devel@nongnu.org; Sat, 04 Mar 2017 21:56:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ckMLQ-0005oZ-BO for qemu-devel@nongnu.org; Sat, 04 Mar 2017 21:56:27 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:36128) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ckMLQ-0005oO-3H; Sat, 04 Mar 2017 21:56:24 -0500 Received: by mail-pf0-x244.google.com with SMTP id j5so13842790pfb.3; Sat, 04 Mar 2017 18:56:23 -0800 (PST) Received: from localhost.localdomain ([49.207.50.75]) by smtp.gmail.com with ESMTPSA id i15sm31408487pfj.0.2017.03.04.18.56.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Mar 2017 18:56:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=CxMpuFTs0Qqi2CZTT1bOYFGTHiPzlcihnnjFsB1grcA=; b=MlerptTPvdixSHqiWiaYey3R1syylmDjgR5OaKQMQT8fXz1C8valo+anOl+RuZx7Xh e3h+Vav5OTr0vcnOwTqa9aignjkr/WKsdHAML74N2unixmfY8y2qkGU23Ta7FU5bG/K3 eag89sl41zhzrIUr/URSnOmd1UJLJLqUCechKxCOJNarfaDzruPR3Lm3+0fnXenoW1Q+ UxEqX5tCcMTqGdgmc7bV6WZAJZZjo4V1Dy5xbJJekCe9tHtl2lFM7h3Qg+RMlyy5GtBy +SVlnaaAz1BfTh/QKVUvIsh+AkChGNZ1d/eXbuX3sSBSg+nMp1zopcztTKjaozcYfZUm jygA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=CxMpuFTs0Qqi2CZTT1bOYFGTHiPzlcihnnjFsB1grcA=; b=btEF4OTgblmlIK4Rd38+HcmMnPTz6AZ0rUmh4/3XkJUuIPWbPrlxJ/HXr7/s7MkNAm 7ChHXLNoH/5rXGAn1M7ZG/yCEo2lBOfy/8CrIcZJ/I9yxaHfFrs+Kfhzg18qLWpRbKDS hBFOc9eYZQEtJmniMod72h6SU7WAjx14UEqFfuvSRcPQrJoWG/bDpP3lzx0erKazJikA r/AXNyugjUhn5bUXWNb6wG61MKPIiR9SuS+U3Kjqf7Wol1MrfEPNO3qzOqU5sc/ELl+D UsQexOxVloqxlh/M1ZWYcSIl1LYB8TksRCC0I2wS0lenuN2DATyvDu5N1RSGoJ5jqs42 fWtA== X-Gm-Message-State: AMke39k1Dv3PufGz23/4FOCPtydnfdl9z0iYbg52OoYaQJkFLNCWS4CjQndMdTg5QOUuZg== X-Received: by 10.99.188.10 with SMTP id q10mr12311779pge.106.1488682582784; Sat, 04 Mar 2017 18:56:22 -0800 (PST) From: Saurav Sachidanand To: qemu-devel@nongnu.org Date: Sun, 5 Mar 2017 02:56:05 +0000 Message-Id: <20170305025605.3824-1-sauravsachidanand@gmail.com> X-Mailer: git-send-email 2.12.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c00::244 Subject: [Qemu-devel] [Qemu-trivial] [PATCH v2] util: Use g_malloc/g_free in envlist.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Saurav Sachidanand , laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Change malloc/free to g_malloc/g_free in util/envlist.c, except for entry->env_var which is allocated using strdup(3). Remove NULL checks for pointers returned from g_malloc as it exits in case of failure. Update calls to envlist_create to reflect this. Free array returned by envlist_to_environ using g_free. Update comments to reflect change in semantics. Refactor nearby code to make scripts/checkpatch.pl happy. Signed-off-by: Saurav Sachidanand --- bsd-user/main.c | 12 +++--------- linux-user/main.c | 7 ++----- util/envlist.c | 34 +++++++++++++++------------------- 3 files changed, 20 insertions(+), 33 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 714a692e6f..4d715840ff 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -744,10 +744,7 @@ int main(int argc, char **argv) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -785,10 +782,7 @@ int main(int argc, char **argv) usage(); } else if (!strcmp(r, "ignore-environment")) { envlist_free(envlist); - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(1); - } + envlist =3D envlist_create(); } else if (!strcmp(r, "U")) { r =3D argv[optind++]; if (envlist_unsetenv(envlist, r) !=3D 0) @@ -959,7 +953,7 @@ int main(int argc, char **argv) free(*wrk); } - free(target_environ); + g_free(target_environ); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/linux-user/main.c b/linux-user/main.c index 10a3bb3a12..3542c899f6 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -4229,10 +4229,7 @@ int main(int argc, char **argv, char **envp) qemu_init_cpu_list(); module_call_init(MODULE_INIT_QOM); - if ((envlist =3D envlist_create()) =3D=3D NULL) { - (void) fprintf(stderr, "Unable to allocate envlist\n"); - exit(EXIT_FAILURE); - } + envlist =3D envlist_create(); /* add current environment into the list */ for (wrk =3D environ; *wrk !=3D NULL; wrk++) { @@ -4432,7 +4429,7 @@ int main(int argc, char **argv, char **envp) free(*wrk); } - free(target_environ); + g_free(target_environ); if (qemu_loglevel_mask(CPU_LOG_PAGE)) { qemu_log("guest_base 0x%lx\n", guest_base); diff --git a/util/envlist.c b/util/envlist.c index e86857e70a..a42eefa5fe 100644 --- a/util/envlist.c +++ b/util/envlist.c @@ -17,16 +17,14 @@ static int envlist_parse(envlist_t *envlist, const char *env, int (*)(envlist_t *, const char *)); /* - * Allocates new envlist and returns pointer to that or - * NULL in case of error. + * Allocates new envlist and returns pointer to it. */ envlist_t * envlist_create(void) { envlist_t *envlist; - if ((envlist =3D malloc(sizeof (*envlist))) =3D=3D NULL) - return (NULL); + envlist =3D g_malloc(sizeof(*envlist)); QLIST_INIT(&envlist->el_entries); envlist->el_count =3D 0; @@ -49,9 +47,9 @@ envlist_free(envlist_t *envlist) QLIST_REMOVE(entry, ev_link); free((char *)entry->ev_var); - free(entry); + g_free(entry); } - free(envlist); + g_free(envlist); } /* @@ -156,15 +154,15 @@ envlist_setenv(envlist_t *envlist, const char *env) if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); free((char *)entry->ev_var); - free(entry); + g_free(entry); } else { envlist->el_count++; } - if ((entry =3D malloc(sizeof (*entry))) =3D=3D NULL) - return (errno); - if ((entry->ev_var =3D strdup(env)) =3D=3D NULL) { - free(entry); + entry =3D g_malloc(sizeof(*entry)); + entry->ev_var =3D strdup(env); + if (entry->ev_var =3D=3D NULL) { + g_free(entry); return (errno); } QLIST_INSERT_HEAD(&envlist->el_entries, entry, ev_link); @@ -202,7 +200,7 @@ envlist_unsetenv(envlist_t *envlist, const char *env) if (entry !=3D NULL) { QLIST_REMOVE(entry, ev_link); free((char *)entry->ev_var); - free(entry); + g_free(entry); envlist->el_count--; } @@ -212,12 +210,12 @@ envlist_unsetenv(envlist_t *envlist, const char *env) /* * Returns given envlist as array of strings (in same form that * global variable environ is). Caller must free returned memory - * by calling free(3) for each element and for the array. Returned - * array and given envlist are not related (no common references). + * by calling free(3) for each element, and g_free for the array. + * Returned array and given envlist are not related (no common + * references). * * If caller provides count pointer, number of items in array is - * stored there. In case of error, NULL is returned and no memory - * is allocated. + * stored there. */ char ** envlist_to_environ(const envlist_t *envlist, size_t *count) @@ -225,9 +223,7 @@ envlist_to_environ(const envlist_t *envlist, size_t *co= unt) struct envlist_entry *entry; char **env, **penv; - penv =3D env =3D malloc((envlist->el_count + 1) * sizeof (char *)); - if (env =3D=3D NULL) - return (NULL); + penv =3D env =3D g_malloc((envlist->el_count + 1) * sizeof(char *)); for (entry =3D envlist->el_entries.lh_first; entry !=3D NULL; entry =3D entry->ev_link.le_next) { -- 2.12.0