From patchwork Thu Feb 15 15:17:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 1899383 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=lUdHgj+Q; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::239; helo=mail-lj1-x239.google.com; envelope-from=swupdate+bncbaabb7wvxcxamgqelnq7pjy@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x239.google.com (mail-lj1-x239.google.com [IPv6:2a00:1450:4864:20::239]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TbJZp41vtz23j8 for ; Fri, 16 Feb 2024 02:17:22 +1100 (AEDT) Received: by mail-lj1-x239.google.com with SMTP id 38308e7fff4ca-2d0be4e5cf2sf9575081fa.0 for ; Thu, 15 Feb 2024 07:17:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708010239; cv=pass; d=google.com; s=arc-20160816; b=V7S2FNlx90tZ1YDHZTCyhf3+cunqLinTkUDu5OUk7sljL+SS81A3aslBTNtLrlTZEc SlbYv4o3OWc91H2HBSusWAFuBCZ/v7lHkFHGuNfRN5fuqh2TDuvGPEixk1Xh1hQhrH2q PanFiEVByi+BGc4T7pn7HaNuJGQoLgNHJ98F3aw9LcAk6nk8HHa+UAmK/+7leqcj2j8l A5lUxsOACqiNI49sBC/ZUIG+EfBtnVyfYfakfGxRkzwwjZnXKWxhzPbzn+gPDSNuCSv3 ma2EbQKWyKSFMlDqmmi1QqRfm1MNBxrn50pqpyUQQfwha1dD30MSbL/iH62b8R/R5dtl bStA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:ui-outboundreport:mime-version :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=oFHjDEmch2noVabTVhp3tbWAVAE5Zj7ee9bN9vBGBWI=; fh=jCeA763cRBeFiCcXTGYI+D5dkI44dk7cvD+0Srh8wvc=; b=ox/ZxNEzzEYqpwU66u9nyRYU1lugYB0QRNUHm+fwido05DqvKNGbu7bNAvphOGdl/R 8v/d3qWrmi6cQ2sHZPKE//EKYaTa7pEXY+Ihjm14Q3YkLntmX4fsNE3A5xd9i/o3GQ1H oA6d6ZSrOjuyTLAxAAdql7plp0l5eNcgT4gP9clhU0hMUuhfPHoL64xzAVb9RxNj8hgO 1qr87i82a/DPTzDONmqh7SoIhi9UyzVvSRnBmnOgHI5IPgKLXku7kPkMwLsAAdPwzsfc pThlhA+KuOMA5P1abwxI/+PKklD0XPNDFRI3muAROO2hI4nVOwht6HaS5ReAwe0AViyz lDVQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=Bdl6oQJk; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.126.135 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1708010239; x=1708615039; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:ui-outboundreport:mime-version:message-id:date :subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=oFHjDEmch2noVabTVhp3tbWAVAE5Zj7ee9bN9vBGBWI=; b=lUdHgj+QW79uvBV26lMlkVWboyJWRJuEQT9Zwk1Y7qDCTv4g/Ne2BdKN2zHCqb0K/D IrCxIspmGaLEKkSnIzEVUQq8djdAEDLNc2P/EyHCSI9xDs7UXlg7wLQCx21fjYNBLg/q blPRjzMl1z6mVWWAp5kjp0TG/eMzJubxb1IW+w8zdpbK9jhcLdhYYm4URyAdBZ/JaWPH GV5kgQn9PcmmXL1JP6Vq7dK2Pnn6z0lN6Cw999ioiUoDvL92ypjmE3T8wbSmSoWCrphI hrV03BdHE2LPhKxarqFuXnagaScIAuoHyneVROJa5IpPQ6RN7bL2Y0rimU+U8R3bFigO QfMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708010239; x=1708615039; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :ui-outboundreport:mime-version:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=oFHjDEmch2noVabTVhp3tbWAVAE5Zj7ee9bN9vBGBWI=; b=S+3RgufvjI9Sc57nWpVwCnDaP9PWv1Y/SsmAlprpLnfYXss3UAgzXyFCDm/gpyNG9M 9ZckDwfhf4GRIVtwDY5MIHbboHXuRUdShITX6jpUVwZqQJ70XFIznDPQXRagpqx2Dj03 Mpfz1LpMuumFosW20FxAEAVoAx6PtMtBTWX+gPMcprHU6wAOdSPozxkS//tWENKkVFAR Wzv81qJVVlm4EiXQMRPIKRiqKCFh350Yv9VmUjvoS7DQVyMY3+Jo2Xsj/oFWjhr41TsZ +JHJ0IW7WCZYx5PC3JhmrsXdq7ZOvscXU0IEDeNWeUju/7yMD4p8wZPJXudMSPCNm7/s vwIQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCU3lXnnYkZLeVYGzmoj+GGcdgba5Vc54OudZ41RYQMYpr39IW5DQsQw5QVSXilEyKtQOvMvmeId/qBvnkMd0ALEXtGiZWRL/O7QQxmrtA== X-Gm-Message-State: AOJu0Yx/6cUmrfK3Wp7p7q/ULbT6+1IR8khD6zvM08cywxUHLVTQopRo urzC4BW308cWWd+8mCtiCzWfCiTGXcFA650ZejlLJGBgm5WHdK3C X-Google-Smtp-Source: AGHT+IHj/mTG2DZpUt02GXbX0FjpEy45cDo5wvntMZKspF3t2HWLHpQkjoVySD6sJ7upRSxlmXcxdw== X-Received: by 2002:a05:651c:120e:b0:2d1:e76:862 with SMTP id i14-20020a05651c120e00b002d10e760862mr1535763lja.48.1708010238714; Thu, 15 Feb 2024 07:17:18 -0800 (PST) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:651c:128d:b0:2d0:9fd0:8d89 with SMTP id 13-20020a05651c128d00b002d09fd08d89ls588166ljc.0.-pod-prod-03-eu; Thu, 15 Feb 2024 07:17:17 -0800 (PST) X-Received: by 2002:a05:651c:1401:b0:2d1:1e6f:7b7e with SMTP id u1-20020a05651c140100b002d11e6f7b7emr1288016lje.17.1708010236807; Thu, 15 Feb 2024 07:17:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708010236; cv=none; d=google.com; s=arc-20160816; b=m7Ce+UWBfXomyI9xnzKl+IzsAsn5q9NSZkHTHLnv3eKOEyd6yZNonT2KDmJj+nungc RLfNI9854060B3FjoToFslMuqPnV62lBCIANwSqCBICYq9VushyxvC3T4ZCtgj+wg5GM +FJBF3WnhhzC2qfRw9rNAcRebbfG2sW0kTNtqSK5g8LeEMZ8Wri6GoOJD4PXDF7LJQnX 8qVkkwg5blNvH8HUD5l0Bmpgo4As7qCGVvfkQRBMED7GWeY/GSFcjjPeG4bSzoweNUlq 6RbIrLesDg2uK5r/vn8HhrnJt8f6SExZAdsiJSfuv+tXA8OfaNhLOYNXDiSxa2iX4Vy5 qi9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=ui-outboundreport:content-transfer-encoding:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=46Abi4LZz1DYigkD2w0jmT5x9DG36tXg4osEHRzmStU=; fh=TiEWcqMcKpHk5s7uErzpntoONrNfOXwKpI5P8bIlggk=; b=achgGZ8Gajw/bIlhvd9tQP/uh9oHjEZaiO6hX9WqGLFovnVn/ay5DxdC37xJxqcss5 wOwFe5OBSH4JpvnLOK3bckHfxBHyo8Sm1Zkqb0SgxdiD1m/AVWmzh6r+IYqwQA6sMevk orszjQkmuWXUJtIW9kEazHkcOXoar/f2nAp0COjE+KgJvsb0dtwPY5UCoCXCLk53K18v 98mDU33Z/ZQEqYe2XaCgiCiv1J+sqVnJew2z1d6xD3UCqYVijuS+/5a+AkroYiT12Rdj VybXrJGP5dX8V8jo1TkOEPc8jFNlRHBZMAf2pB5bTAtb0zF5OwJh2mSqbmhnP0vBcgA4 16dg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=Bdl6oQJk; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.126.135 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Received: from mout.kundenserver.de (mout.kundenserver.de. [212.227.126.135]) by gmr-mx.google.com with ESMTPS id e5-20020a2e9845000000b002d110eb34absi57421ljj.5.2024.02.15.07.17.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 07:17:16 -0800 (PST) Received-SPF: pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.126.135 as permitted sender) client-ip=212.227.126.135; X-UI-Sender-Class: 55c96926-9e95-11ee-ae09-1f7a4046a0f6 Received: from paperino.fritz.box ([88.217.136.221]) by mrelayeu.kundenserver.de (mreue012 [213.165.67.97]) with ESMTPSA (Nemesis) id 1MDN3O-1rhkkf3ycQ-00AVAh; Thu, 15 Feb 2024 16:17:16 +0100 From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [PATCH] Cleanup: using strtobool where needed Date: Thu, 15 Feb 2024 16:17:14 +0100 Message-Id: <20240215151714.115528-1-stefano.babic@swupdate.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:yAQw/4pJkVH6ufTDyU2jiKm0GEOnFCFZcYH69nI9IvetJa6MTht X1vDSPlNOvloS/jjeWzJ/cmsqvPyJ0JNpR8IFV0Zl64BG4okf4KEq2ychN7XtAfb/Lfe48Z NzX93QlnTSy9ITHMnQ6TBFNosdgXt/HXIo5Ba1gqn5mW1gCQkkOuXwMh+74Qgtl9UzcA1ss IFIimncIaEUJJWbl01TMw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:6ZFbK7g4mJY=;JxpYNF3xBNIzrYdA734x2VlIoeU dZ6B0eO+4fDXvhi6tjSqXzGMwIIltIgxoatoPi2yFCvo2ro9P6ZIg/7Oc+LqYlV+pDWoikUVI 35wEHT4BIe2ujLk+TmEdWFBScjISdJAgAOYEl4spwY8ru9dpi5TEyg/Xg16nvMG1BPvp9XCqf mdTr8bjAfNPojLuUcuzGu1LZowM+iRZe5agpvuMSztnCQDwBAXg3BVbHcZVvCZU3n3/CPJDjC F0Fkl7LmEO8QN+7bx1qoD/dT2RZspRtXrpV5D7Nm3Bg62d8HbqAfmYsJzn4KkQiD6eOjS878z 0dDbi8UOkCrx9kujYJQfdgXMXVPMDNrslZ8ZdOaE5LcELpVuzV3mcZc68jjTn7JlwRlaJ3i54 ZpiT4MwdSobfeXGfXLOKQKe7K6meHg9ANQQal64u0c/oZ6ieba/bEzQOMbEEYJr7NWbz0KhT1 dv5aLe+G1VcsjKLeeGcNfQYLvnRfbah9UDmOcbMULwKGBfzrL7FYsxhUeIn5hJ0jECGT2LcQu iza1+dUaXiPU8Nhk5MI6/cDiS5eME6J7J40Hp1DgsRlk+lFnmbqByZDnX9M3wy9KZYCvDS7DK UE+6XpcYSBpmdgIo4qqt8i8Z2Bu+6V+XArwtUQl3LO7xgZRlGnpPobIjnNgZ6fGUlFUJKinni 52aUV/7dfxiiibGqD2ppfcvNt20ba/XdXDfVPkwJQJPKwVhovdFo2DYHGCSMli1xPJA9NDrcx y9rYDIN4yt+Lm/v0ZHG6pNnj5l6tg5KUgcxnS/Wc4VHF8Ga54w2Gq8= X-Original-Sender: stefano.babic@swupdate.org X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@swupdate.org header.s=s1-ionos header.b=Bdl6oQJk; spf=pass (google.com: domain of stefano.babic@swupdate.org designates 212.227.126.135 as permitted sender) smtp.mailfrom=stefano.babic@swupdate.org Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Replacing occurencies of string comparison with the global function. Signed-off-by: Stefano Babic --- handlers/btrfs_handler.c | 2 +- handlers/diskformat_handler.c | 2 +- handlers/diskpart_handler.c | 2 +- handlers/ucfw_handler.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) -- 2.34.1 diff --git a/handlers/btrfs_handler.c b/handlers/btrfs_handler.c index c7be1153..32ecfa6c 100644 --- a/handlers/btrfs_handler.c +++ b/handlers/btrfs_handler.c @@ -43,7 +43,7 @@ static int btrfs(struct img_type *img, ERROR("Wrong operation of btrfs filesystem: %s", cmd); return -EINVAL; } - bool tomount = IS_STR_EQUAL(dict_get_value(&img->properties, "mount"), "true"); + bool tomount = strtobool(dict_get_value(&img->properties, "mount")); if (tomount) { if (!strlen(img->device)) { ERROR("btrfs must be mounted, no device set"); diff --git a/handlers/diskformat_handler.c b/handlers/diskformat_handler.c index 742954ab..635cea92 100644 --- a/handlers/diskformat_handler.c +++ b/handlers/diskformat_handler.c @@ -35,7 +35,7 @@ static int diskformat(struct img_type *img, char *force = dict_get_value(&img->properties, "force"); - if (force != NULL && strcmp(force, "true") == 0) { + if (force != NULL && strtobool(force)) { ; /* Skip file system exists check */ } else { /* Check if file system exists */ diff --git a/handlers/diskpart_handler.c b/handlers/diskpart_handler.c index 84f1bd7c..4c2b902b 100644 --- a/handlers/diskpart_handler.c +++ b/handlers/diskpart_handler.c @@ -1275,7 +1275,7 @@ static int diskpart(struct img_type *img, part->flags |= DOS_FLAG_ACTIVE; break; case PART_FORCE: - part->force = strcmp(equal, "true") == 0; + part->force = strtobool(equal); TRACE("Force flag explicitly mentioned, value %d", part->force); break; } diff --git a/handlers/ucfw_handler.c b/handlers/ucfw_handler.c index 842018e6..0834ead5 100644 --- a/handlers/ucfw_handler.c +++ b/handlers/ucfw_handler.c @@ -672,8 +672,7 @@ static int get_gpio_from_property(struct dict_list *prop, struct mode_setup *gpi return -EINVAL; break; case 2: - if (!strcmp(s, "true")) - gpio->active_low = true; + gpio->active_low = strtobool(s); break; } @@ -731,7 +730,7 @@ static int install_uc_firmware_image(struct img_type *img, properties = dict_get_list(&img->properties, "debug"); if (properties) { entry = LIST_FIRST(properties); - if (entry && !strcmp(entry->value, "true")) + if (entry && strtobool(entry->value)) hnd_data.debug = true; }