From owner-dev-commits-src-all@freebsd.org Sat Sep 25 18:52:23 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D39FD6AE4CA; Sat, 25 Sep 2021 18:52:23 +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 4HGygq5d4Kz3HyM; Sat, 25 Sep 2021 18:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 9D33B7AA5; Sat, 25 Sep 2021 18:52:23 +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 18PIqN5i032120; Sat, 25 Sep 2021 18:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18PIqN8T032119; Sat, 25 Sep 2021 18:52:23 GMT (envelope-from git) Date: Sat, 25 Sep 2021 18:52:23 GMT Message-Id: <202109251852.18PIqN8T032119@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 9d324b5ffc8a - main - mount: Don't pass a NULL format string to xo_err(). 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/main X-Git-Reftype: branch X-Git-Commit: 9d324b5ffc8a783ceff2a78dea19602a1d8f045a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Sep 2021 18:52:23 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=9d324b5ffc8a783ceff2a78dea19602a1d8f045a commit 9d324b5ffc8a783ceff2a78dea19602a1d8f045a Author: John Baldwin AuthorDate: 2021-09-25 18:51:01 +0000 Commit: John Baldwin CommitDate: 2021-09-25 18:52:10 +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 --- 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 02242791a7a2..80eda100c66f 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) {