From nobody Tue May 10 23:24:08 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 1C44D1AD7EC3; Tue, 10 May 2022 23:24:11 +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 4KyYyd6Sx2z4cFw; Tue, 10 May 2022 23:24:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225050; 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=hMbcyxUZ3OUfMCABqnO04zP9qfC0e8fj93o1OE01oXE=; b=TRly/jbvxZVx3HBqZjnbh2h6U406u+VHpl6ArF0eadG+zCdAD0wdSt8EMCpCLxnjShbD5d 1g40XZthywY49qRp7L1E3jB2TNQi3d4sl1ikkaZl6f61+JSLy007gq6CbefjqBbOyBb0LR BQBgjAiQ5ebiczUpcS2hunohYJwu2/GsEvuBaWGIcpTaZlZ1jmYM2iqg0oGJjfAglTKl+9 Q+FEFZ5afXYzv5e4S2qoaYZ2s8SaJElOXtsrqgi/EFjfYkj5ipPyEnTjn63K8qjepbseAI qg1P3P30dHpTxW9kFE1SLeyFhB8IHztVLXAhmXzZvwXawbw49fds1rVPnZZATw== 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 302646AEB; Tue, 10 May 2022 23:24:08 +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 24ANO8Vc072418; Tue, 10 May 2022 23:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ANO8bA072417; Tue, 10 May 2022 23:24:08 GMT (envelope-from git) Date: Tue, 10 May 2022 23:24:08 GMT Message-Id: <202205102324.24ANO8bA072417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a23f4ab7a170 - stable/13 - mount: Don't pass a NULL format string to xo_err(). 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a23f4ab7a1700962187889d797fa699da015fb33 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225050; 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=hMbcyxUZ3OUfMCABqnO04zP9qfC0e8fj93o1OE01oXE=; b=ZarJES0oCdU3Emq9BHNMBw0Rz2BgiR3EHDhrJHAmIDA4HN4yMHazZQ9BqFD8KGICqOqbOF EwzYfUJT8N4i273jP6Yz3qrRmr0TUMqaInhkBuQk2cR72b1De8j9KiAVOGw9WJtIjhbNYU veUAlbVEfNSEm9vqEcsfWiWr+G3wria8M2hL5RgyX+khZFGfAYwtf4JOd4Huv3tyUJV0yg 5rckc/IgO/a2x/6rA0XUbyUT6m0HT8bErvfriXS5iE8PiMVKh8FjjGGlwd5JqWreuakcRj AZqmzDMfNlLPI5HIZHa0Ue7gIpStozrqBwxvK5EAkdOQpQsBhNaGkXL5U3o+rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652225050; a=rsa-sha256; cv=none; b=fgvUka6+ClzLa1UN/dZQUuf4E4KHcBLNC9Xpqkv2AjjuwBIFgQ2h5p83v3vOfHYFmlL1EC uglTX4G2xQQeyVmEj9xm/6yRbHBFXHTYQkePdBH2rC+Fm59llTh36l2VljSJ0R5QxqhUHB 3WkQjn6ItNg3MhZByu6sdlODnWDXimxpbTKpCrSOjb8AAPyDh+jnpegj94z5Vy8epqe1ZU cawJIT/qk9Ub9Y2lUFXMx0GXk6VRT1PbWRaQA5N1K4wTp5rmBdIuU4AYottNjEHehdvsgJ ZAfCyCaUqlMD2qa+W/XRl7BsWa3IOOUlsbN69jMdIOVsNVFjm/SRCum4iAfF9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a23f4ab7a1700962187889d797fa699da015fb33 commit a23f4ab7a1700962187889d797fa699da015fb33 Author: John Baldwin AuthorDate: 2021-09-25 18:51:01 +0000 Commit: John Baldwin CommitDate: 2022-05-10 22:51:49 +0000 mount: Don't pass a NULL format string to xo_err(). This fixes a -Wformat error from GCC 9. Fixes: e725ee7eb672 mount: add libxo(3) support (cherry picked from commit 9d324b5ffc8a783ceff2a78dea19602a1d8f045a) --- sbin/mount/mount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 4073448b7400..cbb2a8784e26 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -192,7 +192,7 @@ specified_ro(const char *arg) optbuf = strdup(arg); if (optbuf == NULL) - xo_err(1, NULL); + xo_err(1, "strdup failed"); for (opt = optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) { if (strcmp(opt, "ro") == 0) {