make names more consistent

This commit is contained in:
Josh Coalson
2002-11-07 05:08:59 +00:00
parent b8f8a07684
commit d4dbadcc11
4 changed files with 191 additions and 191 deletions

View File

@@ -31,8 +31,8 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#ifndef FLAC__SHARE__GETOPT_H
#define FLAC__SHARE__GETOPT_H
#ifndef SHARE__GETOPT_H
#define SHARE__GETOPT_H
#if defined(FLAC__NO_DLL) || defined(unix) || defined(__CYGWIN__) || defined(__CYGWIN32__)
#define GETOPT_API
@@ -59,60 +59,60 @@
extern "C" {
#endif
/* For communication from `FLAC__share__getopt' to the caller.
When `FLAC__share__getopt' finds an option that takes an argument,
/* For communication from `share__getopt' to the caller.
When `share__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. */
GETOPT_API extern char *FLAC__share__optarg;
GETOPT_API extern char *share__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 `FLAC__share__getopt'.
and for communication between successive calls to `share__getopt'.
On entry to `FLAC__share__getopt', zero means this is the first call; initialize.
On entry to `share__getopt', zero means this is the first call; initialize.
When `FLAC__share__getopt' returns -1, this is the index of the first of the
When `share__getopt' returns -1, this is the index of the first of the
non-option elements that the caller should itself scan.
Otherwise, `FLAC__share__optind' communicates from one call to the next
Otherwise, `share__optind' communicates from one call to the next
how much of ARGV has been scanned so far. */
GETOPT_API extern int FLAC__share__optind;
GETOPT_API extern int share__optind;
/* Callers store zero here to inhibit the error message `FLAC__share__getopt' prints
/* Callers store zero here to inhibit the error message `share__getopt' prints
for unrecognized options. */
GETOPT_API extern int FLAC__share__opterr;
GETOPT_API extern int share__opterr;
/* Set to an option character which was unrecognized. */
GETOPT_API extern int FLAC__share__optopt;
GETOPT_API extern int share__optopt;
/*[JEC] was:#ifndef __need_getopt */
/* Describe the long-named options requested by the application.
The LONG_OPTIONS argument to FLAC__share__getopt_long or FLAC__share__getopt_long_only is a vector
of `struct FLAC__share__option' terminated by an element containing a name which is
The LONG_OPTIONS argument to share__getopt_long or share__getopt_long_only is a vector
of `struct share__option' terminated by an element containing a name which is
zero.
The field `has_arg' is:
FLAC__share__no_argument (or 0) if the option does not take an argument,
FLAC__share__required_argument (or 1) if the option requires an argument,
FLAC__share__optional_argument (or 2) if the option takes an optional argument.
share__no_argument (or 0) if the option does not take an argument,
share__required_argument (or 1) if the option requires an argument,
share__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 `FLAC__share__optarg', set the
a compiled-in constant, such as set a value from `share__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, `FLAC__share__getopt'
one). For long options that have a zero `flag' field, `share__getopt'
returns the contents of the `val' field. */
struct FLAC__share__option
struct share__option
{
# if defined __STDC__ && __STDC__
const char *name;
@@ -126,11 +126,11 @@ struct FLAC__share__option
int val;
};
/* Names for the values of the `has_arg' field of `struct FLAC__share__option'. */
/* Names for the values of the `has_arg' field of `struct share__option'. */
# define FLAC__share__no_argument 0
# define FLAC__share__required_argument 1
# define FLAC__share__optional_argument 2
# define share__no_argument 0
# define share__required_argument 1
# define share__optional_argument 2
/*[JEC] was:#endif*/ /* need getopt */
@@ -140,45 +140,45 @@ struct FLAC__share__option
Return the option character from OPTS just read. Return -1 when
there are no more options. For unrecognized options, or options
missing arguments, `FLAC__share__optopt' is set to the option letter, and '?' is
missing arguments, `share__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 `FLAC__share__optarg'.
takes an argument, to be placed in `share__optarg'.
If a letter in OPTS is followed by two colons, its argument is
optional. This behavior is specific to the GNU `FLAC__share__getopt'.
optional. This behavior is specific to the GNU `share__getopt'.
The argument `--' causes premature termination of argument
scanning, explicitly telling `FLAC__share__getopt' that there are no more
scanning, explicitly telling `share__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
`FLAC__share__getopt'. */
`share__getopt'. */
/*[JEC] was:#if defined __STDC__ && __STDC__*/
/*[JEC] was:# 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. */
GETOPT_API extern int FLAC__share__getopt (int __argc, char *const *__argv, const char *__shortopts);
GETOPT_API extern int share__getopt (int __argc, char *const *__argv, const char *__shortopts);
/*[JEC] was:# else*/ /* not __GNU_LIBRARY__ */
/*[JEC] was:extern int getopt ();*/
/*[JEC] was:# endif*/ /* __GNU_LIBRARY__ */
/*[JEC] was:# ifndef __need_getopt*/
GETOPT_API extern int FLAC__share__getopt_long (int __argc, char *const *__argv, const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind);
GETOPT_API extern int FLAC__share__getopt_long_only (int __argc, char *const *__argv,
GETOPT_API extern int share__getopt_long (int __argc, char *const *__argv, const char *__shortopts,
const struct share__option *__longopts, int *__longind);
GETOPT_API extern int share__getopt_long_only (int __argc, char *const *__argv,
const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind);
const struct share__option *__longopts, int *__longind);
/* Internal only. Users should not call this directly. */
GETOPT_API extern int FLAC__share___getopt_internal (int __argc, char *const *__argv,
GETOPT_API extern int share___getopt_internal (int __argc, char *const *__argv,
const char *__shortopts,
const struct FLAC__share__option *__longopts, int *__longind,
const struct share__option *__longopts, int *__longind,
int __long_only);
/*[JEC] was:# endif*/
/*[JEC] was:#else*/ /* not __STDC__ */