diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-10-24 20:29:20 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-10-24 20:29:20 +0000 |
| commit | 7440c23e03fac030ec163f331c1084e6bcf0c8c1 (patch) | |
| tree | 4bc151c37adfde0a7b2e67e16fc6b2c9dd64c421 /nis/nis_domain_of_r.c | |
| parent | 1d5cee233d407b0abca1c64b2de712619c26ede4 (diff) | |
| download | glibc-7440c23e03fac030ec163f331c1084e6bcf0c8c1.zip glibc-7440c23e03fac030ec163f331c1084e6bcf0c8c1.tar.gz glibc-7440c23e03fac030ec163f331c1084e6bcf0c8c1.tar.bz2 | |
Update.
* include/libc-symbols.h: Define hidden attribute macros for libnsl.
* include/rpcsvc/nislib.h: Use libnsl_hidden_proto for various
functions.
* nis/nis_add.c: Add libnsl_hidden_def. Minor optimizations.
* nis/nis_call.c: Likewise.
* nis/nis_clone_obj.c: Likewise.
* nis/nis_defaults.c: Likewise.
* nis/nis_domain_of_r.c: Likewise.
* nis/nis_error.c: Likewise.
* nis/nis_file.c: Likewise.
* nis/nis_free.c: Likewise.
* nis/nis_local_names.c: Likewise.
* nis/nis_lookup.c: Likewise.
* nis/nis_modify.c: Likewise.
* nis/nis_print.c: Likewise.
* nis/nis_remove.c: Likewise.
* nis/nis_subr.c: Likewise.
* nis/nis_table.c: Likewise.
* nis/nis_util.c: Likewise.
* nis/yp_xdr.c: Likewise.
* nis/ypclnt.c: Likewise.
* nis/ypupdate_xdr.c: Likewise.
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 167a499..ca298f3 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) |