From nobody Tue Jan 16 17:21:50 2024 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 4TDwmG6PpBz57flv; Tue, 16 Jan 2024 17:21:50 +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 4TDwmG5YMvz4l8y; Tue, 16 Jan 2024 17:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705425710; 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=FL+ZuHp4NwMVCcbnH0BFCTnU/s+PnggOZ//mTKq429g=; b=EBxlC+86QVHqfDl4WdkJMCEm6gj6pgSn0gQ0Ck4+27Mhkb8hJ1jkBwi+KZNA2ecaCOrn2O 6ktWXCP5oM1sjR0+r2HSdqzDRoHor3u7r2D12fu/jrk2Bsl8MmlXTgrb6hSrec1MuA7E6h hXCzWd6PhyvI8Rptkmm/+oM3Mg8rn2uYhAJ+xJdHT3qvZl1NqKBiyOFAONruQ0uFMSUBNM DYx671VHvOC7LYSAw+WgLeLHyTqf55JdGY/nGOeqy5tpnwyPmclHIJPyA4Z7jn+j/wASwb atjeP/zPVAYSI66fl1N3U4YsTW16kg+feTX4FxUmEb3rr4GFk7Ww4voOWF5a5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705425710; 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=FL+ZuHp4NwMVCcbnH0BFCTnU/s+PnggOZ//mTKq429g=; b=Gnwyj8r5tsRGe3vWd0J1C4GtAsIQwCxRu7JD2jmuCYf3cZgUIWmrdupSmvkHQ9Sjfnncu0 xbRXaPRyUGE0CMGcsxxkjq0J0xcNsQgcaZG3/YZAj9TCWdTEfRjrxXIJOpx76HR9WJXRuv pmm+pMaWKCFAQyC5AzGmwllBaOehki4+TnKazb9obA2rOm+h0HKa+Zx6RBxZl0QWy28KUs rY3Mia8ZrHW68N3q8KxSTl1hLKk35651b0g7ZYUVuTzERBMNCl/yWyZvu1OFnLG6nYo5uF mXMePfHJwJuDl1H7CRl9L2ves9dxISOApmTZjTDaemKnL4KrMFfPmiQa0RLxcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705425710; a=rsa-sha256; cv=none; b=Y3pIg/UZiYdEOJN++VtlgOO1Khfozu11lM4KNDFOafFNPMkoP+JCZeJMS6xSrILplnL8Ec gi8huUTGjw9V5bgK4eOV7K0BX+IMlMqCylpOJCyNHNIxyjYrbhSzxAPK3r9p8MGSB/+sp5 c/5UqgkcgWTGTTBlKZjG/lie3jpq0HMC3jjZr/ZRBzJzuIes1NEDsb5R9Ml7s6Rr3lI2kY thEo1qr8xPTHjy966BHmXRNvCoq+GTwmX3CQyRv0yDb9q2Pz87VqU5IiV41QSQASDNugtC kLGS77NRy8qURJaXB0qoJKkMf39UoYMiOgFA7sLxQbEuGgI6SwOS/JdIj+l9kg== 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 4TDwmG4d3dzq1k; Tue, 16 Jan 2024 17:21:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40GHLo2V036709; Tue, 16 Jan 2024 17:21:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40GHLoH9036706; Tue, 16 Jan 2024 17:21:50 GMT (envelope-from git) Date: Tue, 16 Jan 2024 17:21:50 GMT Message-Id: <202401161721.40GHLoH9036706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 81ea920435b4 - main - pflowclt: fix gcc build error 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81ea920435b4980683a0329cc43060fc060cf479 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=81ea920435b4980683a0329cc43060fc060cf479 commit 81ea920435b4980683a0329cc43060fc060cf479 Author: Kristof Provost AuthorDate: 2024-01-16 16:29:12 +0000 Commit: Kristof Provost CommitDate: 2024-01-16 17:18:09 +0000 pflowclt: fix gcc build error gcc is unhappy with the nested extern declaration of __progname, so move it out of the usage() function. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pflowctl/pflowctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/pflowctl/pflowctl.c b/sbin/pflowctl/pflowctl.c index 7be85d8b6ad4..35daedfdf478 100644 --- a/sbin/pflowctl/pflowctl.c +++ b/sbin/pflowctl/pflowctl.c @@ -47,11 +47,11 @@ static int get(int id); +extern char *__progname; + static void usage(void) { - extern char *__progname; - fprintf(stderr, "usage: %s [-la] [-d id]\n", __progname);