mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-15 23:50:13 +00: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.
189 lines
6.5 KiB
C
189 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 _SYS_TIME_H
|
|
#define _SYS_TIME_H 1
|
|
|
|
#include <features.h>
|
|
|
|
#include <bits/types.h>
|
|
#include <bits/types/time_t.h>
|
|
#include <bits/types/struct_timeval.h>
|
|
|
|
#ifndef __suseconds_t_defined
|
|
typedef __suseconds_t suseconds_t;
|
|
# define __suseconds_t_defined
|
|
#endif
|
|
|
|
#include <sys/select.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#ifdef __USE_GNU
|
|
/* Macros for converting between `struct timeval' and `struct timespec'. */
|
|
# define TIMEVAL_TO_TIMESPEC(tv, ts) { \
|
|
(ts)->tv_sec = (tv)->tv_sec; \
|
|
(ts)->tv_nsec = (tv)->tv_usec * 1000; \
|
|
}
|
|
# define TIMESPEC_TO_TIMEVAL(tv, ts) { \
|
|
(tv)->tv_sec = (ts)->tv_sec; \
|
|
(tv)->tv_usec = (ts)->tv_nsec / 1000; \
|
|
}
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
/* Structure crudely representing a timezone.
|
|
This is obsolete and should never be used. */
|
|
struct timezone
|
|
{
|
|
int tz_minuteswest; /* Minutes west of GMT. */
|
|
int tz_dsttime; /* Nonzero if DST is ever in effect. */
|
|
};
|
|
|
|
typedef struct timezone *__restrict __timezone_ptr_t;
|
|
#else
|
|
typedef void *__restrict __timezone_ptr_t;
|
|
#endif
|
|
|
|
/* Get the current time of day and timezone information,
|
|
putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled.
|
|
Returns 0 on success, -1 on errors.
|
|
NOTE: This form of timezone information is obsolete.
|
|
Use the functions and variables declared in <time.h> instead. */
|
|
extern int gettimeofday (struct timeval *__restrict __tv,
|
|
__timezone_ptr_t __tz) __THROW __nonnull ((1));
|
|
|
|
#ifdef __USE_MISC
|
|
/* Set the current time of day and timezone information.
|
|
This call is restricted to the super-user. */
|
|
extern int settimeofday (const struct timeval *__tv,
|
|
const struct timezone *__tz)
|
|
__THROW;
|
|
|
|
/* Adjust the current time of day by the amount in DELTA.
|
|
If OLDDELTA is not NULL, it is filled in with the amount
|
|
of time adjustment remaining to be done from the last `adjtime' call.
|
|
This call is restricted to the super-user. */
|
|
extern int adjtime (const struct timeval *__delta,
|
|
struct timeval *__olddelta) __THROW;
|
|
#endif
|
|
|
|
|
|
/* Values for the first argument to `getitimer' and `setitimer'. */
|
|
enum __itimer_which
|
|
{
|
|
/* Timers run in real time. */
|
|
ITIMER_REAL = 0,
|
|
#define ITIMER_REAL ITIMER_REAL
|
|
/* Timers run only when the process is executing. */
|
|
ITIMER_VIRTUAL = 1,
|
|
#define ITIMER_VIRTUAL ITIMER_VIRTUAL
|
|
/* Timers run when the process is executing and when
|
|
the system is executing on behalf of the process. */
|
|
ITIMER_PROF = 2
|
|
#define ITIMER_PROF ITIMER_PROF
|
|
};
|
|
|
|
/* Type of the second argument to `getitimer' and
|
|
the second and third arguments `setitimer'. */
|
|
struct itimerval
|
|
{
|
|
/* Value to put into `it_value' when the timer expires. */
|
|
struct timeval it_interval;
|
|
/* Time to the next timer expiration. */
|
|
struct timeval it_value;
|
|
};
|
|
|
|
#if defined __USE_GNU && !defined __cplusplus
|
|
/* Use the nicer parameter type only in GNU mode and not for C++ since the
|
|
strict C++ rules prevent the automatic promotion. */
|
|
typedef enum __itimer_which __itimer_which_t;
|
|
#else
|
|
typedef int __itimer_which_t;
|
|
#endif
|
|
|
|
/* Set *VALUE to the current setting of timer WHICH.
|
|
Return 0 on success, -1 on errors. */
|
|
extern int getitimer (__itimer_which_t __which,
|
|
struct itimerval *__value) __THROW;
|
|
|
|
/* Set the timer WHICH to *NEW. If OLD is not NULL,
|
|
set *OLD to the old value of timer WHICH.
|
|
Returns 0 on success, -1 on errors. */
|
|
extern int setitimer (__itimer_which_t __which,
|
|
const struct itimerval *__restrict __new,
|
|
struct itimerval *__restrict __old) __THROW;
|
|
|
|
/* Change the access time of FILE to TVP[0] and the modification time of
|
|
FILE to TVP[1]. If TVP is a null pointer, use the current time instead.
|
|
Returns 0 on success, -1 on errors. */
|
|
extern int utimes (const char *__file, const struct timeval __tvp[2])
|
|
__THROW __nonnull ((1));
|
|
|
|
#ifdef __USE_MISC
|
|
/* Same as `utimes', but does not follow symbolic links. */
|
|
extern int lutimes (const char *__file, const struct timeval __tvp[2])
|
|
__THROW __nonnull ((1));
|
|
|
|
/* Same as `utimes', but takes an open file descriptor instead of a name. */
|
|
extern int futimes (int __fd, const struct timeval __tvp[2]) __THROW;
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
/* Change the access time of FILE relative to FD to TVP[0] and the
|
|
modification time of FILE to TVP[1]. If TVP is a null pointer, use
|
|
the current time instead. Returns 0 on success, -1 on errors. */
|
|
extern int futimesat (int __fd, const char *__file,
|
|
const struct timeval __tvp[2]) __THROW;
|
|
#endif
|
|
|
|
|
|
#ifdef __USE_MISC
|
|
/* Convenience macros for operations on timevals.
|
|
NOTE: `timercmp' does not work for >= or <=. */
|
|
# define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
|
|
# define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
|
|
# define timercmp(a, b, CMP) \
|
|
(((a)->tv_sec == (b)->tv_sec) \
|
|
? ((a)->tv_usec CMP (b)->tv_usec) \
|
|
: ((a)->tv_sec CMP (b)->tv_sec))
|
|
# define timeradd(a, b, result) \
|
|
do { \
|
|
(result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \
|
|
(result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \
|
|
if ((result)->tv_usec >= 1000000) \
|
|
{ \
|
|
++(result)->tv_sec; \
|
|
(result)->tv_usec -= 1000000; \
|
|
} \
|
|
} while (0)
|
|
# define timersub(a, b, result) \
|
|
do { \
|
|
(result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
|
|
(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
|
|
if ((result)->tv_usec < 0) { \
|
|
--(result)->tv_sec; \
|
|
(result)->tv_usec += 1000000; \
|
|
} \
|
|
} while (0)
|
|
#endif /* Misc. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* sys/time.h */
|