diff options
author | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 11:01:56 +0000 |
---|---|---|
committer | Arthur de Jong <arthur@arthurdejong.org> | 2006-10-12 11:01:56 +0000 |
commit | dba09bb1389491f82beb862323a5ccab428a7f2d (patch) | |
tree | e617b84715ab650b6cd162876f7ff6d0b897a05a /ltf.c | |
parent | 54845e6fb6d0fa0f7f77b4a7d8520897e0e98496 (diff) |
first round of cleanups, all non-glibc NSS stuff has been removed, because we are going to do some major restructuring it will not likely remain valid anyway and we can always re-add it later
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@10 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'ltf.c')
-rw-r--r-- | ltf.c | 29 |
1 files changed, 9 insertions, 20 deletions
@@ -1,4 +1,5 @@ -/* Copyright (C) 1997-2005 Luke Howard. +/* + Copyright (C) 1997-2005 Luke Howard This file is part of the nss_ldap library. Contributed by Luke Howard, <lukeh@padl.com>, 1997. @@ -16,9 +17,9 @@ License along with the nss_ldap library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -static char rcsId[] = "$Id$"; + $Id$ +*/ #include "config.h" @@ -49,7 +50,7 @@ static char rcsId[] = "$Id$"; static void *ltf_mutex_alloc (void); static void ltf_mutex_free (void *m); -static NSS_STATUS ltf_tsd_setup (void); +static enum nss_status ltf_tsd_setup (void); static void ltf_set_ld_error (int err, char *matched, char *errmsg, void *dummy); static int ltf_get_ld_error (char **matched, char **errmsg, void *dummy); @@ -80,7 +81,7 @@ static int ltf_mutex_unlock (void *); static pthread_key_t key; -NSS_STATUS _nss_ldap_ltf_thread_init (LDAP * ld) +enum nss_status _nss_ldap_ltf_thread_init (LDAP * ld) { struct ldap_thread_fns tfns; @@ -128,13 +129,7 @@ ltf_mutex_lock (void *mutexp) { #if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) return __libc_lock_lock (*(pthread_mutex_t *) mutexp); -#elif defined(HPUX) - return __thread_mutex_lock ((pthread_mutex_t *) mutexp); #else -# ifdef _AIX - if (__multi_threaded == 0) - return 0; -# endif return pthread_mutex_lock ((pthread_mutex_t *) mutexp); #endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ } @@ -144,18 +139,12 @@ ltf_mutex_unlock (void *mutexp) { #if defined(HAVE_LIBC_LOCK_H) || defined(HAVE_BITS_LIBC_LOCK_H) return __libc_lock_unlock (*(pthread_mutex_t *) mutexp); -#elif defined(HPUX) - return __thread_mutex_unlock ((pthread_mutex_t *) mutexp); #else -# ifdef _AIX - if (__multi_threaded == 0) - return 0; -# endif return pthread_mutex_unlock ((pthread_mutex_t *) mutexp); #endif /* HAVE_LIBC_LOCK_H || HAVE_BITS_LIBC_LOCK_H */ } -static NSS_STATUS +static enum nss_status ltf_tsd_setup (void) { void *tsd; @@ -270,7 +259,7 @@ ltf_destr (void *tsd) free (tsd); } -static NSS_STATUS +static enum nss_status ltf_tsd_setup (void) { void *tsd; @@ -331,7 +320,7 @@ ltf_get_errno (void) return errno; } -NSS_STATUS _nss_ldap_ltf_thread_init (LDAP * ld) +enum nss_status _nss_ldap_ltf_thread_init (LDAP * ld) { struct ldap_thread_fns tfns; |