qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* nis/nis_subr.c: Some minor code cleanups.

This commit is contained in:
Ulrich Drepper 2005-07-30 19:37:11 +00:00
parent 29c21e4900
commit 1ce359b0fc
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-07-30 Ulrich Drepper <drepper@redhat.com>
* nis/nis_subr.c: Some minor code cleanups.
2005-07-29 Ulrich Drepper <drepper@redhat.com>
* misc/bits/syslog.h: New file.

20
nis/nis_subr.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 1997, 1999, 2000, 2004 Free Software Foundation, Inc.
/* Copyright (c) 1997, 1999, 2000, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997.
@ -39,22 +39,13 @@ nis_leaf_of_r (const_nis_name name, char *buffer, size_t buflen)
while (name[i] != '.' && name[i] != '\0')
i++;
if (i > buflen - 1)
if (__builtin_expect (i > buflen - 1, 0))
{
__set_errno (ERANGE);
return NULL;
}
if (i > 0)
{
if ((size_t)i >= buflen)
{
__set_errno (ERANGE);
return NULL;
}
*((char *) __mempcpy (buffer, name, i)) = '\0';
}
*((char *) __mempcpy (buffer, name, i)) = '\0';
return buffer;
}
@ -98,13 +89,12 @@ nis_name_of_r (const_nis_name name, char *buffer, size_t buflen)
}
libnsl_hidden_def (nis_name_of_r)
static int
static int __always_inline
count_dots (const_nis_name str)
{
int count = 0;
size_t l = strlen (str);
for (size_t i = 0; i < l; ++i)
for (size_t i = 0; str[i] != '\0'; ++i)
if (str[i] == '.')
++count;