From nobody Wed Oct 19 08:01:33 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MsjqL14VPz4gDRh; Wed, 19 Oct 2022 08:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MsjqL07kCz3yf4; Wed, 19 Oct 2022 08:01:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cEuWw3S8Gej7liLhkJOOnWjd/zzoFtnPZ3i7wGa/Yho=; b=OkH5mOcDdwgGnJUqSxPh181JcjEY9nNTw7a/QjCYcFvgK2WiUI95X5aQMVqdqH45/AlON0 Pg7e3WQcMsQ6dtMr2TMWvwBUvi5Ym25MnivZ7eKuMJ16TgatkhRz5P0msUaGFUb2okkm8s BD/VdTOUMWGYAC1Qwya1lpGySNCyH57gJ7wcgqAGiN8H9EyxCa0QUPqLI24RP1vVSDCf7O uvhAYcs5qGGopZAsm85U7wMbjSb0Hx+ELSBwpBsM6aSj6xz+fAl6MMLq9H6zAh47lVBWUl TH5VDxoDPqUOUV49oABjQj7CfL57FdCAUtDGuI4kURWltW1V+nifEQQ9A+pIvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MsjqK4rrGzSVp; Wed, 19 Oct 2022 08:01:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29J81Xda061340; Wed, 19 Oct 2022 08:01:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81Xbj061339; Wed, 19 Oct 2022 08:01:33 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:33 GMT Message-Id: <202210190801.29J81Xbj061339@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e891183e60ce - stable/13 - sort: use memset to initialize structure when possible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e891183e60cee62a05d58b173fabd7876d522008 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166494; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cEuWw3S8Gej7liLhkJOOnWjd/zzoFtnPZ3i7wGa/Yho=; b=hPXiB6DCdMP85V+icks8P4VJ54G3Iadiab+vjNtZ+KM/HZdWU/E1iauZUCmFcQpsLqmM+7 SQ9ZHm+fY6T20/nAiZc9d4CaA48EIX3vvnWbT9aXZ+fqJyOD4Avin6vbUg5OkoW4XE3qaz 55czfk1kqKCBABFsSuwI2/4pNFeI6b21guDsMDrKFVxfGBPS4rdyxtvz2u/CE0oSA+nq21 ZSRIakI5KGH5mB87LzDl8qKpNjKVCKTDt/qopa0TgkWAY8qJc1VARENzaG8Eo/NaDaPHAD vM5LipII71kvtOoVacnhAzZ2m1EMqmj/xBKnZWBVnrKu0bg8nE+itZzeA2W79A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166494; a=rsa-sha256; cv=none; b=btxnZ5jrOMLSKgsJW6TnoY7HCdYACH3G9c9psRzyY+C3Ed36LlTnuP5e1lDRtG9PeUrjtl dndoseOuRDmzWKng/mXiY2GI8q2uCLCxPiumBqxep5qSUHE6acyxmkeLiw973Dw1cDtwZM FRL9IiL1bYQ/nmKpYCnPXx9CK/QL9CanuzG4XSs3icGQnWFCDgjGoEc8PRSCZUUGIfWxRX E4zhDpkSd/HbSBO3ZNpohjyP8IrBr1TBhCjaNHUYE6UdtQbx7WuVbnnU1NrVQXhC3Hbb/6 2O7xncWnMa+msFMHUOmQu0M4Uy0hwkEbvsS8B1R4ucD9GC11hXvY8YF8CCzWlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e891183e60cee62a05d58b173fabd7876d522008 commit e891183e60cee62a05d58b173fabd7876d522008 Author: Baptiste Daroussin AuthorDate: 2022-10-13 07:07:46 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:29 +0000 sort: use memset to initialize structure when possible (cherry picked from commit f02c783757365340763739e58ef0e68ec13a0f8f) --- usr.bin/sort/file.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/usr.bin/sort/file.c b/usr.bin/sort/file.c index 437be09819b5..2e3b4e0a4350 100644 --- a/usr.bin/sort/file.c +++ b/usr.bin/sort/file.c @@ -208,9 +208,7 @@ file_list_init(struct file_list *fl, bool tmp) { if (fl) { - fl->count = 0; - fl->sz = 0; - fl->fns = NULL; + memset(fl, 0, sizeof(*fl)); fl->tmp = tmp; } } @@ -285,10 +283,8 @@ sort_list_init(struct sort_list *l) { if (l) { - l->count = 0; - l->size = 0; + memset(l, 0, sizeof(*l)); l->memsize = sizeof(struct sort_list); - l->list = NULL; } }