From nobody Thu Feb 8 17:45:10 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 4TW4BZ5gzZz5B6BT; Thu, 8 Feb 2024 17:45:10 +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 4TW4BZ54C9z4d8L; Thu, 8 Feb 2024 17:45:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707414310; 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=eU+cnThG0CVkSfkLWRb2JBaLsa1pYSVHVS016xjZN9g=; b=cC/wiZEymNpEtu1NWBUu928Q26yFA/l1CgvrKxIpkoqGU5gtP68x/9Z9Dh14Nief6eDydg cIX6cGrxCA7eAbmMHGjy9eRUNPny5hj03C71pyqYRuhF46wgoE34FfuzkyEQdC1oN30IUw OMXpQXuRXawiVqV8TY/l1NE83/bPFltzdNH+XG1pLdhVBrPPEzvj31rckM5tYlZJRUcM7g XSCliAPK7T7S4PKFEiW1QGspmm3A02F9DbTxUjkljUFD2FAYZ9z5QfCFLSrrGMBAgxobUo VNE5lPoIVXF+RrQhvn1nH/z1TfqtJYuuxxVsCpszc8KHW+uWpJm4eguDzcpx4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707414310; 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=eU+cnThG0CVkSfkLWRb2JBaLsa1pYSVHVS016xjZN9g=; b=Wp465VUVnXu4KQGlTQBThEMKBXU5B6sB5Pigi8a9KevPbvY1WnKQCRRUVtvuuBrTEPeAwK xmsjsoHLZxkbMZzMyvvySLuWBtMAf41LnLE16nXBhjfP8Kq7breNDTuzs2wUvaAIt4Cryk 8bo3BmaV/BTu2Y+EWoyRDV9hY4Fh20LkYBGbKq3dkvUGfVfGUwQZyZPfIEPzT/QvfqTzUd IgHVqop05ZH8mHicV+eXMhtX1PRviWWP2QONc44zUm1OP891yiUA7lJNB9iqsyID/cVviq 58bhQuTG4G3pCMs0v/FMsmLd16bxfc3+neW6zsoDdOTniUCYkXnYbZ3jGXsl4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707414310; a=rsa-sha256; cv=none; b=xMfH7krb+I3zbarZ5SjPHeff6qdAUizrojisNzotJ1pDHZ1MMBgOmLQS6pcP4iHxsu/b6H Zu1tAnLB15VahhEInytFN9yK57mN6ud99Y1NGOgEPWfBOle9BjpRaPPmmUFqOhMaiQo9wA fhA9zEfGR9bARmfIavsqKIC/D5Xqku+KMzHe1KPAx9YjaFvrZI25bGqA9fJvpH1jAjfR/U AMrPuSfIE+J+nmh7owp6lSA5K+BcqLO8V64U77oOmqPbFmYo9uFhCQtbfdE4e2O3jO0wOh D9d70pzsvGLJWLgFWvK8V4LGqmlUDfqrXHB0RR7W4oaDcEOAoGwmd+zJO8eyPQ== 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 4TW4BZ46S2z107t; Thu, 8 Feb 2024 17:45:10 +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 418HjAEm040195; Thu, 8 Feb 2024 17:45:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 418HjAJL040192; Thu, 8 Feb 2024 17:45:10 GMT (envelope-from git) Date: Thu, 8 Feb 2024 17:45:10 GMT Message-Id: <202402081745.418HjAJL040192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Piotr Pawel Stefaniak Subject: git: 94ddf40c0f5d - stable/14 - tcp_wrappers: silence a few warnings 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: pstef X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 94ddf40c0f5d6a73bbe88f956ce66c9d2db4b519 Auto-Submitted: auto-generated The branch stable/14 has been updated by pstef: URL: https://cgit.FreeBSD.org/src/commit/?id=94ddf40c0f5d6a73bbe88f956ce66c9d2db4b519 commit 94ddf40c0f5d6a73bbe88f956ce66c9d2db4b519 Author: Piotr Paweł Stefaniak AuthorDate: 2024-01-21 10:15:48 +0000 Commit: Piotr Paweł Stefaniak CommitDate: 2024-02-08 17:40:06 +0000 tcp_wrappers: silence a few warnings Mostly -Wdeprecated-non-prototype. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D43531 (cherry picked from commit 8297ff13fb604c86797e6a66bc654caff2cf3ce2) --- contrib/tcp_wrappers/options.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c index 481ba2d372d5..26e98db8ed95 100644 --- a/contrib/tcp_wrappers/options.c +++ b/contrib/tcp_wrappers/options.c @@ -76,20 +76,20 @@ static char *chop_string(char *string); /* strip leading and trailing blanks */ /* List of functions that implement the options. Add yours here. */ -static void user_option(); /* execute "user name.group" option */ -static void group_option(); /* execute "group name" option */ -static void umask_option(); /* execute "umask mask" option */ -static void linger_option(); /* execute "linger time" option */ -static void keepalive_option(); /* execute "keepalive" option */ -static void spawn_option(); /* execute "spawn command" option */ -static void twist_option(); /* execute "twist command" option */ -static void rfc931_option(); /* execute "rfc931" option */ -static void setenv_option(); /* execute "setenv name value" */ -static void nice_option(); /* execute "nice" option */ -static void severity_option(); /* execute "severity value" */ -static void allow_option(); /* execute "allow" option */ -static void deny_option(); /* execute "deny" option */ -static void banners_option(); /* execute "banners path" option */ +static void user_option(char *, struct request_info *); /* user name.group */ +static void group_option(char *, struct request_info *); /* group name */ +static void umask_option(char *, struct request_info *); /* umask mask */ +static void linger_option(char *, struct request_info *); /* linger time */ +static void keepalive_option(char *, struct request_info *); /* keepalive */ +static void spawn_option(char *, struct request_info *); /* spawn command */ +static void twist_option(char *, struct request_info *); /* twist command */ +static void rfc931_option(char *, struct request_info *); /* rfc931 */ +static void setenv_option(char *, struct request_info *); /* setenv name value */ +static void nice_option(char *, struct request_info *); /* nice */ +static void severity_option(char *, struct request_info *); /* severity value */ +static void allow_option(char *, struct request_info *); /* allow */ +static void deny_option(char *, struct request_info *); /* deny */ +static void banners_option(char *, struct request_info *); /* banners path */ /* Structure of the options table. */ @@ -197,9 +197,7 @@ void process_options(char *options, struct request_info *request) /* ARGSUSED */ -static void allow_option(value, request) -char *value; -struct request_info *request; +static void allow_option(char *value, struct request_info *request) { longjmp(tcpd_buf, AC_PERMIT); } @@ -208,9 +206,7 @@ struct request_info *request; /* ARGSUSED */ -static void deny_option(value, request) -char *value; -struct request_info *request; +static void deny_option(char *value, struct request_info *request) { longjmp(tcpd_buf, AC_DENY); } @@ -250,7 +246,6 @@ static void banners_option(char *value, struct request_info *request) static void group_option(char *value, struct request_info *request) { struct group *grp; - struct group *getgrnam(); if ((grp = getgrnam(value)) == 0) tcpd_jump("unknown group: \"%s\"", value); @@ -267,7 +262,6 @@ static void group_option(char *value, struct request_info *request) static void user_option(char *value, struct request_info *request) { struct passwd *pwd; - struct passwd *getpwnam(); char *group; if ((group = split_at(value, '.')) != 0)