mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
34a5a1460e
The GNU Coding Standards specify that line breaks in expressions should go before an operator, not after one. This patch fixes various code to do this. It only changes code that appears to be mostly following GNU style anyway, not files and directories with substantially different formatting. It is not exhaustive even for files using GNU style (for example, changes to sysdeps files are deferred for subsequent cleanups). Some files changed are shared with gnulib, but most are specific to glibc. Changes were made manually, with places to change found by grep (so some cases, e.g. where the operator was followed by a comment at end of line, are particularly liable to have been missed by grep, but I did include cases where the operator was followed by backslash-newline). This patch generally does not attempt to address other coding style issues in the expressions changed (for example, missing spaces before '(', or lack of parentheses to ensure indentation of continuation lines properly reflects operator precedence). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-memmem.c (simple_memmem): Break lines before rather than after operators. * benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise. * crypt/md5.c (md5_finish_ctx): Likewise. * crypt/sha256.c (__sha256_finish_ctx): Likewise. * crypt/sha512.c (__sha512_finish_ctx): Likewise. * elf/cache.c (load_aux_cache): Likewise. * elf/dl-load.c (open_verify): Likewise. * elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise. * elf/readelflib.c (process_elf_file): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/sprof.c (generate_call_graph): Likewise. * hurd/ctty-input.c (_hurd_ctty_input): Likewise. * hurd/ctty-output.c (_hurd_ctty_output): Likewise. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/getdport.c (__getdport): Likewise. * hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise. * hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Likewise. * hurd/hurdioctl.c (fioctl): Likewise. * hurd/hurdselect.c (_hurd_select): Likewise. * hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise. (STOPSIGS): Likewise. * hurd/hurdstartup.c (_hurd_startup): Likewise. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/msgportdemux.c (msgport_server): Likewise. * hurd/setauth.c (_hurd_setauth): Likewise. * include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise. * libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise. * locale/programs/ld-ctype.c (set_class_defaults): Likewise. * localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise. * login/tst-utmp.c (do_check): Likewise. (simulate_login): Likewise. * mach/lowlevellock.h (lll_lock): Likewise. (lll_trylock): Likewise. * math/test-fenv.c (ALL_EXC): Likewise. * math/test-fenvinline.c (ALL_EXC): Likewise. * misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise. * nis/nis_call.c (__do_niscall3): Likewise. * nis/nis_callback.c (cb_prog_1): Likewise. * nis/nis_defaults.c (searchaccess): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nis/nis_ismember.c (internal_ismember): Likewise. * nis/nis_local_names.c (nis_local_principal): Likewise. * nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r): Likewise. * nis/ypclnt.c (yp_match): Likewise. (yp_first): Likewise. (yp_next): Likewise. (yp_master): Likewise. (yp_order): Likewise. * nscd/hstcache.c (cache_addhst): Likewise. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise. * posix/glob.h (__GLOB_FLAGS): Likewise. * posix/regcomp.c (peek_token): Likewise. (peek_token_bracket): Likewise. (parse_expression): Likewise. * posix/regexec.c (sift_states_iter_mb): Likewise. (check_node_accept_bytes): Likewise. * posix/tst-spawn3.c (do_test): Likewise. * posix/wordexp-test.c (testit): Likewise. * posix/wordexp.c (parse_tilde): Likewise. (exec_comm): Likewise. * posix/wordexp.h (__WRDE_FLAGS): Likewise. * resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise. * setjmp/sigjmp.c (__sigjmp_save): Likewise. * stdio-common/printf_fp.c (__printf_fp_l): Likewise. * stdio-common/tst-fileno.c (do_test): Likewise. * stdio-common/vfprintf-internal.c (vfprintf): Likewise. * stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise. * stdlib/strtod_l.c (round_and_return): Likewise. (____STRTOF_INTERNAL): Likewise. * stdlib/tst-strfrom.h (TEST_STRFROM): Likewise. * string/strcspn.c (STRCSPN): Likewise. * string/test-memmem.c (simple_memmem): Likewise. * termios/tcsetattr.c (tcsetattr): Likewise. * time/alt_digit.c (_nl_parse_alt_digit): Likewise. * time/asctime.c (asctime_internal): Likewise. * time/strptime_l.c (__strptime_internal): Likewise. * time/sys/time.h (timercmp): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
182 lines
6.5 KiB
C
182 lines
6.5 KiB
C
/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _GLOB_H
|
|
#define _GLOB_H 1
|
|
|
|
#include <sys/cdefs.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
/* We need `size_t' for the following definitions. */
|
|
#ifndef __size_t
|
|
typedef __SIZE_TYPE__ __size_t;
|
|
# if defined __USE_XOPEN || defined __USE_XOPEN2K8
|
|
typedef __SIZE_TYPE__ size_t;
|
|
# endif
|
|
#else
|
|
/* The GNU CC stddef.h version defines __size_t as empty. We need a real
|
|
definition. */
|
|
# undef __size_t
|
|
# define __size_t size_t
|
|
#endif
|
|
|
|
/* Bits set in the FLAGS argument to `glob'. */
|
|
#define GLOB_ERR (1 << 0)/* Return on read errors. */
|
|
#define GLOB_MARK (1 << 1)/* Append a slash to each name. */
|
|
#define GLOB_NOSORT (1 << 2)/* Don't sort the names. */
|
|
#define GLOB_DOOFFS (1 << 3)/* Insert PGLOB->gl_offs NULLs. */
|
|
#define GLOB_NOCHECK (1 << 4)/* If nothing matches, return the pattern. */
|
|
#define GLOB_APPEND (1 << 5)/* Append to results of a previous call. */
|
|
#define GLOB_NOESCAPE (1 << 6)/* Backslashes don't quote metacharacters. */
|
|
#define GLOB_PERIOD (1 << 7)/* Leading `.' can be matched by metachars. */
|
|
|
|
#if !defined __USE_POSIX2 || defined __USE_MISC
|
|
# define GLOB_MAGCHAR (1 << 8)/* Set in gl_flags if any metachars seen. */
|
|
# define GLOB_ALTDIRFUNC (1 << 9)/* Use gl_opendir et al functions. */
|
|
# define GLOB_BRACE (1 << 10)/* Expand "{a,b}" to "a" "b". */
|
|
# define GLOB_NOMAGIC (1 << 11)/* If no magic chars, return the pattern. */
|
|
# define GLOB_TILDE (1 << 12)/* Expand ~user and ~ to home directories. */
|
|
# define GLOB_ONLYDIR (1 << 13)/* Match only directories. */
|
|
# define GLOB_TILDE_CHECK (1 << 14)/* Like GLOB_TILDE but return an error
|
|
if the user name is not available. */
|
|
# define __GLOB_FLAGS (GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS \
|
|
|GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND \
|
|
|GLOB_PERIOD|GLOB_ALTDIRFUNC|GLOB_BRACE \
|
|
|GLOB_NOMAGIC|GLOB_TILDE|GLOB_ONLYDIR|GLOB_TILDE_CHECK)
|
|
#else
|
|
# define __GLOB_FLAGS (GLOB_ERR|GLOB_MARK|GLOB_NOSORT|GLOB_DOOFFS \
|
|
|GLOB_NOESCAPE|GLOB_NOCHECK|GLOB_APPEND \
|
|
|GLOB_PERIOD)
|
|
#endif
|
|
|
|
/* Error returns from `glob'. */
|
|
#define GLOB_NOSPACE 1 /* Ran out of memory. */
|
|
#define GLOB_ABORTED 2 /* Read error. */
|
|
#define GLOB_NOMATCH 3 /* No matches found. */
|
|
#define GLOB_NOSYS 4 /* Not implemented. */
|
|
#ifdef __USE_GNU
|
|
/* Previous versions of this file defined GLOB_ABEND instead of
|
|
GLOB_ABORTED. Provide a compatibility definition here. */
|
|
# define GLOB_ABEND GLOB_ABORTED
|
|
#endif
|
|
|
|
/* Structure describing a globbing run. */
|
|
#ifdef __USE_GNU
|
|
struct stat;
|
|
#endif
|
|
typedef struct
|
|
{
|
|
__size_t gl_pathc; /* Count of paths matched by the pattern. */
|
|
char **gl_pathv; /* List of matched pathnames. */
|
|
__size_t gl_offs; /* Slots to reserve in `gl_pathv'. */
|
|
int gl_flags; /* Set to FLAGS, maybe | GLOB_MAGCHAR. */
|
|
|
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
|
are used instead of the normal file access functions. */
|
|
void (*gl_closedir) (void *);
|
|
#ifdef __USE_GNU
|
|
struct dirent *(*gl_readdir) (void *);
|
|
#else
|
|
void *(*gl_readdir) (void *);
|
|
#endif
|
|
void *(*gl_opendir) (const char *);
|
|
#ifdef __USE_GNU
|
|
int (*gl_lstat) (const char *__restrict, struct stat *__restrict);
|
|
int (*gl_stat) (const char *__restrict, struct stat *__restrict);
|
|
#else
|
|
int (*gl_lstat) (const char *__restrict, void *__restrict);
|
|
int (*gl_stat) (const char *__restrict, void *__restrict);
|
|
#endif
|
|
} glob_t;
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
# ifdef __USE_GNU
|
|
struct stat64;
|
|
# endif
|
|
typedef struct
|
|
{
|
|
__size_t gl_pathc;
|
|
char **gl_pathv;
|
|
__size_t gl_offs;
|
|
int gl_flags;
|
|
|
|
/* If the GLOB_ALTDIRFUNC flag is set, the following functions
|
|
are used instead of the normal file access functions. */
|
|
void (*gl_closedir) (void *);
|
|
# ifdef __USE_GNU
|
|
struct dirent64 *(*gl_readdir) (void *);
|
|
# else
|
|
void *(*gl_readdir) (void *);
|
|
# endif
|
|
void *(*gl_opendir) (const char *);
|
|
# ifdef __USE_GNU
|
|
int (*gl_lstat) (const char *__restrict, struct stat64 *__restrict);
|
|
int (*gl_stat) (const char *__restrict, struct stat64 *__restrict);
|
|
# else
|
|
int (*gl_lstat) (const char *__restrict, void *__restrict);
|
|
int (*gl_stat) (const char *__restrict, void *__restrict);
|
|
# endif
|
|
} glob64_t;
|
|
#endif
|
|
|
|
/* Do glob searching for PATTERN, placing results in PGLOB.
|
|
The bits defined above may be set in FLAGS.
|
|
If a directory cannot be opened or read and ERRFUNC is not nil,
|
|
it is called with the pathname that caused the error, and the
|
|
`errno' value from the failing call; if it returns non-zero
|
|
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
|
|
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
|
|
Otherwise, `glob' returns zero. */
|
|
#if !defined __USE_FILE_OFFSET64
|
|
extern int glob (const char *__restrict __pattern, int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob_t *__restrict __pglob) __THROW;
|
|
|
|
/* Free storage allocated in PGLOB by a previous `glob' call. */
|
|
extern void globfree (glob_t *__pglob) __THROW;
|
|
#else
|
|
extern int __REDIRECT_NTH (glob, (const char *__restrict __pattern,
|
|
int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob_t *__restrict __pglob), glob64);
|
|
|
|
extern void __REDIRECT_NTH (globfree, (glob_t *__pglob), globfree64);
|
|
#endif
|
|
|
|
#ifdef __USE_LARGEFILE64
|
|
extern int glob64 (const char *__restrict __pattern, int __flags,
|
|
int (*__errfunc) (const char *, int),
|
|
glob64_t *__restrict __pglob) __THROW;
|
|
|
|
extern void globfree64 (glob64_t *__pglob) __THROW;
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_GNU
|
|
/* Return nonzero if PATTERN contains any metacharacters.
|
|
Metacharacters can be quoted with backslashes if QUOTE is nonzero.
|
|
|
|
This function is not part of the interface specified by POSIX.2
|
|
but several programs want to use it. */
|
|
extern int glob_pattern_p (const char *__pattern, int __quote) __THROW;
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* glob.h */
|