mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
c2d8f0b704
One group of warnings seen with -Wextra is warnings for static or inline not at the start of a declaration (-Wold-style-declaration). This patch fixes various such cases for inline, ensuring it comes at the start of the declaration (after any static). A common case of the fix is "static inline <type> __always_inline"; the definition of __always_inline starts with __inline, so the natural change is to "static __always_inline <type>". Other cases of the warning may be harder to fix (one pattern is a function definition that gets rewritten to be static by an including file, "#define funcname static wrapped_funcname" or similar), but it seems worth fixing these cases with inline anyway. Tested for x86_64. * elf/dl-load.h (_dl_postprocess_loadcmd): Use __always_inline before return type, without separate inline. * elf/dl-tunables.c (maybe_enable_malloc_check): Likewise. * elf/dl-tunables.h (tunable_is_name): Likewise. * malloc/malloc.c (do_set_trim_threshold): Likewise. (do_set_top_pad): Likewise. (do_set_mmap_threshold): Likewise. (do_set_mmaps_max): Likewise. (do_set_mallopt_check): Likewise. (do_set_perturb_byte): Likewise. (do_set_arena_test): Likewise. (do_set_arena_max): Likewise. (do_set_tcache_max): Likewise. (do_set_tcache_count): Likewise. (do_set_tcache_unsorted_limit): Likewise. * nis/nis_subr.c (count_dots): Likewise. * nptl/allocatestack.c (advise_stack_range): Likewise. * sysdeps/ieee754/dbl-64/s_sin.c (do_cos): Likewise. (do_sin): Likewise. (reduce_sincos): Likewise. (do_sincos): Likewise. * sysdeps/unix/sysv/linux/x86/elision-conf.c (do_set_elision_enable): Likewise. (TUNABLE_CALLBACK_FNDECL): Likewise.
355 lines
7.4 KiB
C
355 lines
7.4 KiB
C
/* Copyright (c) 1997-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
|
|
|
|
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 <errno.h>
|
|
#include <string.h>
|
|
#include <rpcsvc/nis.h>
|
|
#include <shlib-compat.h>
|
|
|
|
nis_name
|
|
nis_leaf_of (const_nis_name name)
|
|
{
|
|
static char result[NIS_MAXNAMELEN + 1];
|
|
|
|
return nis_leaf_of_r (name, result, NIS_MAXNAMELEN);
|
|
}
|
|
libnsl_hidden_nolink_def (nis_leaf_of, GLIBC_2_1)
|
|
|
|
nis_name
|
|
nis_leaf_of_r (const_nis_name name, char *buffer, size_t buflen)
|
|
{
|
|
size_t i = 0;
|
|
|
|
buffer[0] = '\0';
|
|
|
|
while (name[i] != '.' && name[i] != '\0')
|
|
i++;
|
|
|
|
if (__glibc_unlikely (i >= buflen))
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NULL;
|
|
}
|
|
|
|
*((char *) __mempcpy (buffer, name, i)) = '\0';
|
|
|
|
return buffer;
|
|
}
|
|
libnsl_hidden_nolink_def (nis_leaf_of_r, GLIBC_2_1)
|
|
|
|
nis_name
|
|
nis_name_of (const_nis_name name)
|
|
{
|
|
static char result[NIS_MAXNAMELEN + 1];
|
|
|
|
return nis_name_of_r (name, result, NIS_MAXNAMELEN);
|
|
}
|
|
libnsl_hidden_nolink_def (nis_name_of, GLIBC_2_1)
|
|
|
|
nis_name
|
|
nis_name_of_r (const_nis_name name, char *buffer, size_t buflen)
|
|
{
|
|
char *local_domain;
|
|
int diff;
|
|
|
|
local_domain = nis_local_directory ();
|
|
|
|
diff = strlen (name) - strlen (local_domain);
|
|
if (diff <= 0)
|
|
return NULL;
|
|
|
|
if (strcmp (&name[diff], local_domain) != 0)
|
|
return NULL;
|
|
|
|
if ((size_t) diff >= buflen)
|
|
{
|
|
__set_errno (ERANGE);
|
|
return NULL;
|
|
}
|
|
|
|
*((char *) __mempcpy (buffer, name, diff - 1)) = '\0';
|
|
|
|
if (diff - 1 == 0)
|
|
return NULL;
|
|
|
|
return buffer;
|
|
}
|
|
libnsl_hidden_nolink_def (nis_name_of_r, GLIBC_2_1)
|
|
|
|
static __always_inline int
|
|
count_dots (const_nis_name str)
|
|
{
|
|
int count = 0;
|
|
|
|
for (size_t i = 0; str[i] != '\0'; ++i)
|
|
if (str[i] == '.')
|
|
++count;
|
|
|
|
return count;
|
|
}
|
|
|
|
/* If we run out of memory, we don't give already allocated memory
|
|
free. The overhead for bringing getnames back in a safe state to
|
|
free it is to big. */
|
|
nis_name *
|
|
nis_getnames (const_nis_name name)
|
|
{
|
|
const char *local_domain = nis_local_directory ();
|
|
size_t local_domain_len = strlen (local_domain);
|
|
size_t name_len = strlen (name);
|
|
char *path;
|
|
int pos = 0;
|
|
char *saveptr = NULL;
|
|
int have_point;
|
|
const char *cp;
|
|
const char *cp2;
|
|
|
|
int count = 2;
|
|
nis_name *getnames = malloc ((count + 1) * sizeof (char *));
|
|
if (__glibc_unlikely (getnames == NULL))
|
|
return NULL;
|
|
|
|
/* Do we have a fully qualified NIS+ name ? If yes, give it back */
|
|
if (name[name_len - 1] == '.')
|
|
{
|
|
if ((getnames[0] = strdup (name)) == NULL)
|
|
{
|
|
free_null:
|
|
while (pos-- > 0)
|
|
free (getnames[pos]);
|
|
free (getnames);
|
|
return NULL;
|
|
}
|
|
|
|
getnames[1] = NULL;
|
|
|
|
return getnames;
|
|
}
|
|
|
|
/* If the passed NAME is shared a suffix (the latter of course with
|
|
a final dot) with each other we pass back NAME with a final
|
|
dot. */
|
|
if (local_domain_len > 2)
|
|
{
|
|
have_point = 0;
|
|
cp = &local_domain[local_domain_len - 2];
|
|
cp2 = &name[name_len - 1];
|
|
|
|
while (*cp == *cp2)
|
|
{
|
|
if (*cp == '.')
|
|
have_point = 1;
|
|
--cp;
|
|
--cp2;
|
|
if (cp < local_domain)
|
|
{
|
|
have_point = cp2 < name || *cp2 == '.';
|
|
break;
|
|
}
|
|
if (cp2 < name)
|
|
{
|
|
have_point = *cp == '.';
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (have_point)
|
|
{
|
|
getnames[0] = malloc (name_len + 2);
|
|
if (getnames[0] == NULL)
|
|
goto free_null;
|
|
|
|
strcpy (stpcpy (getnames[0], name), ".");
|
|
++pos;
|
|
}
|
|
}
|
|
|
|
/* Get the search path, where we have to search "name" */
|
|
path = getenv ("NIS_PATH");
|
|
if (path == NULL)
|
|
path = strdupa ("$");
|
|
else
|
|
path = strdupa (path);
|
|
|
|
have_point = strchr (name, '.') != NULL;
|
|
|
|
cp = __strtok_r (path, ":", &saveptr);
|
|
while (cp)
|
|
{
|
|
if (strcmp (cp, "$") == 0)
|
|
{
|
|
const char *cptr = local_domain;
|
|
char *tmp;
|
|
|
|
while (*cptr != '\0' && count_dots (cptr) >= 2)
|
|
{
|
|
if (pos >= count)
|
|
{
|
|
count += 5;
|
|
nis_name *newp = realloc (getnames,
|
|
(count + 1) * sizeof (char *));
|
|
if (__glibc_unlikely (newp == NULL))
|
|
goto free_null;
|
|
getnames = newp;
|
|
}
|
|
tmp = malloc (strlen (cptr) + local_domain_len + name_len + 2);
|
|
if (__glibc_unlikely (tmp == NULL))
|
|
goto free_null;
|
|
|
|
getnames[pos] = tmp;
|
|
tmp = stpcpy (tmp, name);
|
|
*tmp++ = '.';
|
|
if (cptr[1] != '\0')
|
|
stpcpy (tmp, cptr);
|
|
else
|
|
++cptr;
|
|
|
|
++pos;
|
|
|
|
while (*cptr != '.' && *cptr != '\0')
|
|
++cptr;
|
|
if (cptr[0] != '\0' && cptr[1] != '\0')
|
|
/* If we have only ".", don't remove the "." */
|
|
++cptr;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
char *tmp;
|
|
size_t cplen = strlen (cp);
|
|
|
|
if (cp[cplen - 1] == '$')
|
|
{
|
|
char *p;
|
|
|
|
tmp = malloc (cplen + local_domain_len + name_len + 2);
|
|
if (__glibc_unlikely (tmp == NULL))
|
|
goto free_null;
|
|
|
|
p = __stpcpy (tmp, name);
|
|
*p++ = '.';
|
|
p = __mempcpy (p, cp, cplen);
|
|
--p;
|
|
if (p[-1] != '.')
|
|
*p++ = '.';
|
|
__stpcpy (p, local_domain);
|
|
}
|
|
else
|
|
{
|
|
char *p;
|
|
|
|
tmp = malloc (cplen + name_len + 3);
|
|
if (__glibc_unlikely (tmp == NULL))
|
|
goto free_null;
|
|
|
|
p = __mempcpy (tmp, name, name_len);
|
|
*p++ = '.';
|
|
p = __mempcpy (p, cp, cplen);
|
|
if (p[-1] != '.')
|
|
*p++ = '.';
|
|
*p = '\0';
|
|
}
|
|
|
|
if (pos >= count)
|
|
{
|
|
count += 5;
|
|
nis_name *newp = realloc (getnames,
|
|
(count + 1) * sizeof (char *));
|
|
if (__glibc_unlikely (newp == NULL))
|
|
goto free_null;
|
|
getnames = newp;
|
|
}
|
|
getnames[pos] = tmp;
|
|
++pos;
|
|
}
|
|
cp = __strtok_r (NULL, ":", &saveptr);
|
|
}
|
|
|
|
if (pos == 0
|
|
&& __asprintf (&getnames[pos++], "%s%s%s%s",
|
|
name, name[name_len - 1] == '.' ? "" : ".",
|
|
local_domain,
|
|
local_domain[local_domain_len - 1] == '.' ? "" : ".") < 0)
|
|
goto free_null;
|
|
|
|
getnames[pos] = NULL;
|
|
|
|
return getnames;
|
|
}
|
|
libnsl_hidden_nolink_def (nis_getnames, GLIBC_2_1)
|
|
|
|
void
|
|
nis_freenames (nis_name *names)
|
|
{
|
|
int i = 0;
|
|
|
|
while (names[i] != NULL)
|
|
{
|
|
free (names[i]);
|
|
++i;
|
|
}
|
|
|
|
free (names);
|
|
}
|
|
libnsl_hidden_nolink_def (nis_freenames, GLIBC_2_1)
|
|
|
|
name_pos
|
|
nis_dir_cmp (const_nis_name n1, const_nis_name n2)
|
|
{
|
|
int len1, len2;
|
|
|
|
len1 = strlen (n1);
|
|
len2 = strlen (n2);
|
|
|
|
if (len1 == len2)
|
|
{
|
|
if (strcmp (n1, n2) == 0)
|
|
return SAME_NAME;
|
|
else
|
|
return NOT_SEQUENTIAL;
|
|
}
|
|
|
|
if (len1 < len2)
|
|
{
|
|
if (n2[len2 - len1 - 1] != '.')
|
|
return NOT_SEQUENTIAL;
|
|
else if (strcmp (&n2[len2 - len1], n1) == 0)
|
|
return HIGHER_NAME;
|
|
else
|
|
return NOT_SEQUENTIAL;
|
|
}
|
|
else
|
|
{
|
|
if (n1[len1 - len2 - 1] != '.')
|
|
return NOT_SEQUENTIAL;
|
|
else if (strcmp (&n1[len1 - len2], n2) == 0)
|
|
return LOWER_NAME;
|
|
else
|
|
return NOT_SEQUENTIAL;
|
|
|
|
}
|
|
}
|
|
libnsl_hidden_nolink_def (nis_dir_cmp, GLIBC_2_1)
|
|
|
|
void
|
|
nis_destroy_object (nis_object *obj)
|
|
{
|
|
nis_free_object (obj);
|
|
}
|
|
libnsl_hidden_nolink_def (nis_destroy_object, GLIBC_2_1)
|