mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 21:23:52 +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.
191 lines
5.0 KiB
C
191 lines
5.0 KiB
C
/* Helper functions used by strftime/strptime to handle alternate digits.
|
|
Copyright (C) 1995-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/>. */
|
|
|
|
#include "../locale/localeinfo.h"
|
|
#include <libc-lock.h>
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include <string.h>
|
|
#include <stdint.h>
|
|
|
|
/* Some of the functions here must not be used while setlocale is called. */
|
|
__libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
|
|
|
|
#define CURRENT(item) (current->values[_NL_ITEM_INDEX (item)].string)
|
|
#define CURRENT_WSTR(item) \
|
|
((wchar_t *) current->values[_NL_ITEM_INDEX (item)].wstr)
|
|
|
|
static void
|
|
_nl_init_alt_digit (struct __locale_data *current)
|
|
{
|
|
struct lc_time_data *data;
|
|
|
|
if (current->private.time == NULL)
|
|
{
|
|
current->private.time = malloc (sizeof *current->private.time);
|
|
if (current->private.time == NULL)
|
|
return;
|
|
memset (current->private.time, 0, sizeof *current->private.time);
|
|
current->private.cleanup = &_nl_cleanup_time;
|
|
}
|
|
data = current->private.time;
|
|
|
|
if (! data->alt_digits_initialized)
|
|
{
|
|
const char *ptr = CURRENT (ALT_DIGITS);
|
|
size_t cnt;
|
|
|
|
data->alt_digits_initialized = 1;
|
|
|
|
if (ptr != NULL)
|
|
{
|
|
data->alt_digits = malloc (100 * sizeof (const char *));
|
|
if (data->alt_digits != NULL)
|
|
for (cnt = 0; cnt < 100; ++cnt)
|
|
{
|
|
data->alt_digits[cnt] = ptr;
|
|
|
|
/* Skip digit format. */
|
|
ptr = strchr (ptr, '\0') + 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
const char *
|
|
_nl_get_alt_digit (unsigned int number, struct __locale_data *current)
|
|
{
|
|
const char *result;
|
|
|
|
if (number >= 100 || CURRENT (ALT_DIGITS)[0] == '\0')
|
|
return NULL;
|
|
|
|
__libc_rwlock_wrlock (__libc_setlocale_lock);
|
|
|
|
if (current->private.time == NULL
|
|
|| ! current->private.time->alt_digits_initialized)
|
|
_nl_init_alt_digit (current);
|
|
|
|
result = ((current->private.time != NULL
|
|
&& current->private.time->alt_digits != NULL)
|
|
? current->private.time->alt_digits[number]
|
|
: NULL);
|
|
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
|
|
return result;
|
|
}
|
|
|
|
|
|
const wchar_t *
|
|
_nl_get_walt_digit (unsigned int number, struct __locale_data *current)
|
|
{
|
|
const wchar_t *result = NULL;
|
|
struct lc_time_data *data;
|
|
|
|
if (number >= 100 || CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0')
|
|
return NULL;
|
|
|
|
__libc_rwlock_wrlock (__libc_setlocale_lock);
|
|
|
|
if (current->private.time == NULL)
|
|
{
|
|
current->private.time = malloc (sizeof *current->private.time);
|
|
if (current->private.time == NULL)
|
|
goto out;
|
|
memset (current->private.time, 0, sizeof *current->private.time);
|
|
current->private.cleanup = &_nl_cleanup_time;
|
|
}
|
|
data = current->private.time;
|
|
|
|
if (! data->walt_digits_initialized)
|
|
{
|
|
const wchar_t *ptr = CURRENT_WSTR (_NL_WALT_DIGITS);
|
|
size_t cnt;
|
|
|
|
data->walt_digits_initialized = 1;
|
|
|
|
if (ptr != NULL)
|
|
{
|
|
data->walt_digits = malloc (100 * sizeof (const uint32_t *));
|
|
if (data->walt_digits != NULL)
|
|
for (cnt = 0; cnt < 100; ++cnt)
|
|
{
|
|
data->walt_digits[cnt] = ptr;
|
|
|
|
/* Skip digit format. */
|
|
ptr = __wcschr (ptr, L'\0') + 1;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (data->walt_digits != NULL)
|
|
result = data->walt_digits[number];
|
|
|
|
out:
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
|
|
return (wchar_t *) result;
|
|
}
|
|
|
|
|
|
int
|
|
_nl_parse_alt_digit (const char **strp, struct __locale_data *current)
|
|
{
|
|
const char *str = *strp;
|
|
int result = -1;
|
|
size_t cnt;
|
|
size_t maxlen = 0;
|
|
|
|
if (CURRENT_WSTR (_NL_WALT_DIGITS)[0] == L'\0')
|
|
return result;
|
|
|
|
__libc_rwlock_wrlock (__libc_setlocale_lock);
|
|
|
|
if (current->private.time == NULL
|
|
|| ! current->private.time->alt_digits_initialized)
|
|
_nl_init_alt_digit (current);
|
|
|
|
if (current->private.time != NULL
|
|
&& current->private.time->alt_digits != NULL)
|
|
/* Matching is not unambiguous. The alternative digits could be like
|
|
I, II, III, ... and the first one is a substring of the second
|
|
and third. Therefore we must keep on searching until we found
|
|
the longest possible match. Note that this is not specified in
|
|
the standard. */
|
|
for (cnt = 0; cnt < 100; ++cnt)
|
|
{
|
|
const char *const dig = current->private.time->alt_digits[cnt];
|
|
size_t len = strlen (dig);
|
|
|
|
if (len > maxlen && strncmp (dig, str, len) == 0)
|
|
{
|
|
maxlen = len;
|
|
result = (int) cnt;
|
|
}
|
|
}
|
|
|
|
__libc_rwlock_unlock (__libc_setlocale_lock);
|
|
|
|
if (result != -1)
|
|
*strp += maxlen;
|
|
|
|
return result;
|
|
}
|