From nobody Tue Dec 9 16:33:02 2025 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 4dQkt72vMKz6J8rt for ; Tue, 09 Dec 2025 16:33:03 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dQkt70lD2z3H64 for ; Tue, 09 Dec 2025 16:33:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765297983; 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=xwSZ7m11mz/pDFx8jVYGSNylwV1Shm1skSdDYJLCL7E=; b=hrp3wnIE2QFbtoEUZK6e5ZU9T+s8GoGq+GMKawTYdsKc1ZDUWWqV8FL11X1tG8RAHipEkM iYfodri1pD5YRafl8HUcSUkIEN0dqeKtZxsip0m9MGqCPRClHSdaD3ACqvnGeDcJ9NkG05 ARMWOpK6i3YM6Jevxekc/HApCAsfpA9nNtESnIz6YiqZTdtirS63ovc3vZiRVw6A5ef2ty HM4blTnXspmtaEjIkHGsJSdRcBcH883cufXm6fiz0O+6ccTQyB87sm5TgIk8Xu+ycyyco+ k7+5c+JEIdE0BhGSOQMZkWbUEXQzlyRpO+7UBjcJ1ZKjpJQZzQR+2dubwT9lQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765297983; 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=xwSZ7m11mz/pDFx8jVYGSNylwV1Shm1skSdDYJLCL7E=; b=FuqyjnAc1u+qFcYW1Uzq2EV+ZcNykiGXL2+yVVl4ttFjwTMAI/5u2KNipCs+CsAxvTmwYe tnBcHIILUNCWDg8ryg0Q5ZpfAeMCV8qqpC/dSEuXFeSeoOrZ07CXqcckxfrdsMEfAavOaN RpXBjwuMsCNwD9vb1CcNJ5+LByfqts9m+0L9WV+CaPLyrZFO5EUS6TgjIQpFYip/KbPpZ1 A7UeH4v6VXLnbAQZVcYVCobRg+lFQY36pgj5xe2BmhQwGqB3jdaYTE7hqGLmM0bpx7usnj bEUveOI4DZawWLCwPGWyOqTeiJ1NaXFV0qANAuvyYRUzL+1xAHDdlu/n9LhfmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765297983; a=rsa-sha256; cv=none; b=lcFNlpyu4aFNmBWL3KVuruhRkZdwOuC2Zco4KghxljUTfB0Pee+qey+4fWBl6P7byiTbOT De69YiL1GJbcSdF0ADWJfs/Qo1HdinmOWxyPl7dCGLICmHnZOEw3vcOj71ddOWgUj6QD9q zWhQanE6jH5Yo9jzWUZsYIWFpGHoVYPBE5WpaNlYze0x6PpgRpbDzQ1U5bMPC6gokI5uh4 AdV4RJ0sd3Zf3kWfqf3pbiG53MNJccDLWB39LMw0Ro4xBP1x3OpIdWkcDIc7vGLYSzgtDh M43uKTTmxXzYSmj/XKbivoQw7nKsfLBQODsqOzI7iVbWmmN2nS7/HdS0wVivIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dQkt66mCpz16BH for ; Tue, 09 Dec 2025 16:33:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 8a60 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 09 Dec 2025 16:33:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 437c77476e72 - stable/15 - diff3: Remove bespoke getopt.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 437c77476e726e0414e460c973fd88fe812ce2b4 Auto-Submitted: auto-generated Date: Tue, 09 Dec 2025 16:33:02 +0000 Message-Id: <69384f3e.8a60.7beeca04@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=437c77476e726e0414e460c973fd88fe812ce2b4 commit 437c77476e726e0414e460c973fd88fe812ce2b4 Author: Ed Maste AuthorDate: 2025-11-18 13:16:22 +0000 Commit: Ed Maste CommitDate: 2025-12-09 16:32:09 +0000 diff3: Remove bespoke getopt.h diff3's getopt.h included a function declaration without a prototype, which produces a compiler warning. Just remove the bespoke getopt.h and use the system header. Reported by: Mark Millard Reviewed by: fuz Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D53802 (cherry picked from commit 38829592dc77e9ead4259785e0bfb93bd4c2fe34) --- contrib/diff/lib/getopt.h | 176 ---------------------------------------------- 1 file changed, 176 deletions(-) diff --git a/contrib/diff/lib/getopt.h b/contrib/diff/lib/getopt.h deleted file mode 100644 index c61768c691bf..000000000000 --- a/contrib/diff/lib/getopt.h +++ /dev/null @@ -1,176 +0,0 @@ -/* Declarations for getopt. - Copyright (C) 1989-1994,1996-1999,2001,2003,2004 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#ifndef _GETOPT_H - -#ifndef __need_getopt -# define _GETOPT_H 1 -#endif - -/* If __GNU_LIBRARY__ is not already defined, either we are being used - standalone, or this is the first header included in the source file. - If we are being used with glibc, we need to include , but - that does not exist if we are standalone. So: if __GNU_LIBRARY__ is - not defined, include , which will pull in for us - if it's from glibc. (Why ctype.h? It's guaranteed to exist and it - doesn't flood the namespace with stuff the way some other headers do.) */ -#if !defined __GNU_LIBRARY__ -# include -#endif - -#ifndef __THROW -# ifndef __GNUC_PREREQ -# define __GNUC_PREREQ(maj, min) (0) -# endif -# if defined __cplusplus && __GNUC_PREREQ (2,8) -# define __THROW throw () -# else -# define __THROW -# endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* For communication from `getopt' to the caller. - When `getopt' finds an option that takes an argument, - the argument value is returned here. - Also, when `ordering' is RETURN_IN_ORDER, - each non-option ARGV-element is returned here. */ - -extern char *optarg; - -/* Index in ARGV of the next element to be scanned. - This is used for communication to and from the caller - and for communication between successive calls to `getopt'. - - On entry to `getopt', zero means this is the first call; initialize. - - When `getopt' returns -1, this is the index of the first of the - non-option elements that the caller should itself scan. - - Otherwise, `optind' communicates from one call to the next - how much of ARGV has been scanned so far. */ - -extern int optind; - -/* Callers store zero here to inhibit the error message `getopt' prints - for unrecognized options. */ - -extern int opterr; - -/* Set to an option character which was unrecognized. */ - -extern int optopt; - -#ifndef __need_getopt -/* Describe the long-named options requested by the application. - The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector - of `struct option' terminated by an element containing a name which is - zero. - - The field `has_arg' is: - no_argument (or 0) if the option does not take an argument, - required_argument (or 1) if the option requires an argument, - optional_argument (or 2) if the option takes an optional argument. - - If the field `flag' is not NULL, it points to a variable that is set - to the value given in the field `val' when the option is found, but - left unchanged if the option is not found. - - To have a long-named option do something other than set an `int' to - a compiled-in constant, such as set a value from `optarg', set the - option's `flag' field to zero and its `val' field to a nonzero - value (the equivalent single-letter option character, if there is - one). For long options that have a zero `flag' field, `getopt' - returns the contents of the `val' field. */ - -struct option -{ - const char *name; - /* has_arg can't be an enum because some compilers complain about - type mismatches in all the code that assumes it is an int. */ - int has_arg; - int *flag; - int val; -}; - -/* Names for the values of the `has_arg' field of `struct option'. */ - -# define no_argument 0 -# define required_argument 1 -# define optional_argument 2 -#endif /* need getopt */ - - -/* Get definitions and prototypes for functions to process the - arguments in ARGV (ARGC of them, minus the program name) for - options given in OPTS. - - Return the option character from OPTS just read. Return -1 when - there are no more options. For unrecognized options, or options - missing arguments, `optopt' is set to the option letter, and '?' is - returned. - - The OPTS string is a list of characters which are recognized option - letters, optionally followed by colons, specifying that that letter - takes an argument, to be placed in `optarg'. - - If a letter in OPTS is followed by two colons, its argument is - optional. This behavior is specific to the GNU `getopt'. - - The argument `--' causes premature termination of argument - scanning, explicitly telling `getopt' that there are no more - options. - - If OPTS begins with `--', then non-option arguments are treated as - arguments to the option '\0'. This behavior is specific to the GNU - `getopt'. */ - -#ifdef __GNU_LIBRARY__ -/* Many other libraries have conflicting prototypes for getopt, with - differences in the consts, in stdlib.h. To avoid compilation - errors, only prototype getopt for the GNU C library. */ -extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) - __THROW; -#else /* not __GNU_LIBRARY__ */ -extern int getopt (); -#endif /* __GNU_LIBRARY__ */ - -#ifndef __need_getopt -extern int getopt_long (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; -extern int getopt_long_only (int ___argc, char *const *___argv, - const char *__shortopts, - const struct option *__longopts, int *__longind) - __THROW; - -#endif - -#ifdef __cplusplus -} -#endif - -/* Make sure we later can get all the definitions and declarations. */ -#undef __need_getopt - -#endif /* getopt.h */