From nobody Sun May 19 02:06:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576074665; cv=none; d=zohomail.com; s=zohoarc; b=C48X5bksXB+VQ0+bKteDX0aRYktjhXDfj3Z4J9XXD1tYFPrZp7bjKx/FRkDw9D4Z2XiENfoYWj45IdZ2u+KuergC1J37IPp88IWTzM7Zvnu8xAK1W7r4PevH3UUU8NKNIZUivWZFz17rAqkujdTM+y6bv5U66JQybDaHH4Tq+Wc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576074665; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=KN9etHlviUCG+vbW1yGc2GU/5pE4ak3K4nMaIwbbgzo=; b=MglIyfru7T/xcEKdeUFMpJsDLrjPbdwR+tzN9PPQVngW8lcqJN4gyWfESTrpT3fMUyMyMnva3tPbT6tGMrE8R8iPGzNc68QNEhijDCJeaU8jkMePz5jmBb8YN1Knlgjh0JZxKpNFCD0F0dqKhOevrxgufiYdpofIPYADYEc/T7g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1576074665542162.12894231444704; Wed, 11 Dec 2019 06:31:05 -0800 (PST) Received: from localhost ([::1]:43244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if316-0004OH-67 for importer@patchew.org; Wed, 11 Dec 2019 09:31:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34007) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1if2ty-0005Qa-2D for qemu-devel@nongnu.org; Wed, 11 Dec 2019 09:23:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1if2tw-0003GG-3N for qemu-devel@nongnu.org; Wed, 11 Dec 2019 09:23:41 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37043) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1if2tv-0003E4-Kx; Wed, 11 Dec 2019 09:23:39 -0500 Received: by mail-wm1-x341.google.com with SMTP id f129so7177817wmf.2; Wed, 11 Dec 2019 06:23:39 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id g23sm2503783wmk.14.2019.12.11.06.23.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2019 06:23:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KN9etHlviUCG+vbW1yGc2GU/5pE4ak3K4nMaIwbbgzo=; b=pLnIGARi5BmE/p1ouE8fQ+i99DJA6bSr0I5aKD+VjiD/xNbZqL7f5iEcvB2fUhipjM 2HyWrbeZtub/BRAjgPwyZOQ+HBBctgwSATArGnWZ2KXLJkekY0GqXvm71IPHmt1JZLA0 lz88/4WmtA8bvfMklZMScak95lf5/pJe5ju8njQF5QX/GsaX+nhMs2uEkAlIx4icH+R+ kjMKYH85GcPfLkJ0OaiuTm+st84ff2VJ0IqoDzI+yLL5PvyKl5nI9HfbLFlb4O2OpX// 7DROM9a4B9wvtvDmaCHuNko7YF7T8mQ+6EK4Ifwc2ZbSobPbKegiUbO5WwzHAfZucSjA KkNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=KN9etHlviUCG+vbW1yGc2GU/5pE4ak3K4nMaIwbbgzo=; b=U/zMB2wbvaEmi9jOQzsCstsaLvVviCJlqDY3lB6PARWIg/leLLL+4ziqvRyrS2GKTq DjSMtOx/7V8L32/i9onhVh1s9/m6uUGc0Iyms60d1qBupM5xVVYDXbfio4hDsk/ESkXl PF1xbJi5C4c0YNaPsMV5t5z7SiF53ZN4uxLp9DYnUGcP5HSE558sG69YtAU3pstGiQX5 t2WtluU0Ua5qdOslCesNZdenOK2cAjU/5ww9+cJ0ehdCuLt3GksAQzFEEoD6vEm5aX05 3Uxo6HEyeKURAPfPS5KGOQKFjPWiNI21YHd+szHGI9N5GofVHEo1K0y/GY7XoUxD00pm HFrQ== X-Gm-Message-State: APjAAAU1XqU7N4035MmZvo5wcBUWK3w1BZZWuh3dREEtqCROAHYsPDYi pLZR5wdMSHb7C4RR882KG4qOI1TZ X-Google-Smtp-Source: APXvYqwfq/vrAT43jWS9/sgvgllG0n04BBZPwQcLnXRQXHIaie2AaCYOkTbLlPiYifMs5qLCP+F2yw== X-Received: by 2002:a7b:cf21:: with SMTP id m1mr49725wmg.170.1576074218369; Wed, 11 Dec 2019 06:23:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] glib: use portable g_setenv() Date: Wed, 11 Dec 2019 15:23:28 +0100 Message-Id: <1576074210-52834-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Marc-Andr=C3=A9 Lureau We have a setenv() wrapper in os-win32.c that no one is actually using. Drop it and change to g_setenv() uniformly. Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- include/sysemu/os-win32.h | 2 -- os-win32.c | 22 ---------------------- tests/libqtest.c | 2 +- tests/test-crypto-tlscredsx509.c | 2 +- tests/test-crypto-tlssession.c | 2 +- tests/test-io-channel-tls.c | 2 +- tests/test-vmstate.c | 2 +- ui/sdl2.c | 2 +- 8 files changed, 6 insertions(+), 30 deletions(-) diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h index ff18b23..d8978e2 100644 --- a/include/sysemu/os-win32.h +++ b/include/sysemu/os-win32.h @@ -67,8 +67,6 @@ int getpagesize(void); # define EPROTONOSUPPORT EINVAL #endif =20 -int setenv(const char *name, const char *value, int overwrite); - typedef struct { long tv_sec; long tv_usec; diff --git a/os-win32.c b/os-win32.c index 1336cd3..6b86e02 100644 --- a/os-win32.c +++ b/os-win32.c @@ -30,28 +30,6 @@ #include "qemu-options.h" #include "sysemu/runstate.h" =20 -/***********************************************************/ -/* Functions missing in mingw */ - -int setenv(const char *name, const char *value, int overwrite) -{ - int result =3D 0; - if (overwrite || !getenv(name)) { - size_t length =3D strlen(name) + strlen(value) + 2; - char *string =3D g_malloc(length); - snprintf(string, length, "%s=3D%s", name, value); - result =3D putenv(string); - - /* Windows takes a copy and does not continue to use our string. - * Therefore it can be safely freed on this platform. POSIX code - * typically has to leak the string because according to the spec = it - * becomes part of the environment. - */ - g_free(string); - } - return result; -} - static BOOL WINAPI qemu_ctrl_handler(DWORD type) { qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_SIGNAL); diff --git a/tests/libqtest.c b/tests/libqtest.c index 91e9cb2..f36e30a 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -254,7 +254,7 @@ QTestState *qtest_init_without_qmp_handshake(const char= *extra_args) s->expected_status =3D 0; s->qemu_pid =3D fork(); if (s->qemu_pid =3D=3D 0) { - setenv("QEMU_AUDIO_DRV", "none", true); + g_setenv("QEMU_AUDIO_DRV", "none", true); execlp("/bin/sh", "sh", "-c", command, NULL); exit(1); } diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx= 509.c index a27efb7..f487349 100644 --- a/tests/test-crypto-tlscredsx509.c +++ b/tests/test-crypto-tlscredsx509.c @@ -141,7 +141,7 @@ int main(int argc, char **argv) =20 module_call_init(MODULE_INIT_QOM); g_test_init(&argc, &argv, NULL); - setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); =20 mkdir(WORKDIR, 0700); =20 diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c index 6560d71..8b2453f 100644 --- a/tests/test-crypto-tlssession.c +++ b/tests/test-crypto-tlssession.c @@ -398,7 +398,7 @@ int main(int argc, char **argv) =20 module_call_init(MODULE_INIT_QOM); g_test_init(&argc, &argv, NULL); - setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); =20 mkdir(WORKDIR, 0700); =20 diff --git a/tests/test-io-channel-tls.c b/tests/test-io-channel-tls.c index 3c9ef6f..ad7554c 100644 --- a/tests/test-io-channel-tls.c +++ b/tests/test-io-channel-tls.c @@ -273,7 +273,7 @@ int main(int argc, char **argv) =20 module_call_init(MODULE_INIT_QOM); g_test_init(&argc, &argv, NULL); - setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); + g_setenv("GNUTLS_FORCE_FIPS_MODE", "2", 1); =20 mkdir(WORKDIR, 0700); =20 diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 1e5be1d..8f184f3 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -1325,7 +1325,7 @@ int main(int argc, char **argv) =20 module_call_init(MODULE_INIT_QOM); =20 - setenv("QTEST_SILENT_ERRORS", "1", 1); + g_setenv("QTEST_SILENT_ERRORS", "1", 1); =20 g_test_init(&argc, &argv, NULL); g_test_add_func("/vmstate/simple/primitive", test_simple_primitive); diff --git a/ui/sdl2.c b/ui/sdl2.c index bd4e736..9030f1c 100644 --- a/ui/sdl2.c +++ b/ui/sdl2.c @@ -772,7 +772,7 @@ static void sdl2_display_init(DisplayState *ds, Display= Options *o) * This is a bit hackish but saves us from bigger problem. * Maybe it's a good idea to fix this in SDL instead. */ - setenv("SDL_VIDEODRIVER", "x11", 0); + g_setenv("SDL_VIDEODRIVER", "x11", 0); #endif =20 if (SDL_Init(SDL_INIT_VIDEO)) { --=20 1.8.3.1