diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-11-02 12:26:42 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-11-02 12:26:42 +0000 |
| commit | 80c96e8e6f452d6d9803f5a2e17030658f30afc4 (patch) | |
| tree | ef584f35ed7167c7a680783415a66799c3789233 /nis/nis_domain_of_r.c | |
| parent | 0b5cfa4e0b7c9dc2cd81635307613c86c0f5e200 (diff) | |
| download | glibc-80c96e8e6f452d6d9803f5a2e17030658f30afc4.tar glibc-80c96e8e6f452d6d9803f5a2e17030658f30afc4.tar.gz glibc-80c96e8e6f452d6d9803f5a2e17030658f30afc4.tar.bz2 glibc-80c96e8e6f452d6d9803f5a2e17030658f30afc4.zip | |
Updated to fedora-glibc-20041102T1153
Diffstat (limited to 'nis/nis_domain_of_r.c')
| -rw-r--r-- | nis/nis_domain_of_r.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nis/nis_domain_of_r.c b/nis/nis_domain_of_r.c index 167a499b80..ca298f3505 100644 --- a/nis/nis_domain_of_r.c +++ b/nis/nis_domain_of_r.c @@ -1,4 +1,4 @@ -/* Copyright (c) 1997 Free Software Foundation, Inc. +/* Copyright (c) 1997, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -29,7 +29,7 @@ nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen) if (buffer == NULL) { - errno = ERANGE; + __set_errno (ERANGE); return NULL; } @@ -44,14 +44,14 @@ nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen) cptr_len = strlen (cptr); if (cptr_len == 0) - strcpy (buffer, "."); - else if (cptr_len >= buflen) + return strcpy (buffer, "."); + + if (__builtin_expect (cptr_len >= buflen, 0)) { - errno = ERANGE; + __set_errno (ERANGE); return NULL; } - else - memcpy (buffer, cptr, cptr_len + 1); - return buffer; + return memcpy (buffer, cptr, cptr_len + 1); } +libnsl_hidden_proto (nis_domain_of_r) |