diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-31 17:46:17 +0000 |
| commit | 8833066b122427710a9e14a888ce6cfa862332d3 (patch) | |
| tree | 29591019d695919417b3698618d6a342e97381d6 /nss | |
| parent | fedca46896bdb702cb988837a0c2c5447e72ba2b (diff) | |
Updated to fedora-glibc-20070731T1624cvs/fedora-glibc-2_6_90-1
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/nss_files/files-hosts.c | 2 | ||||
| -rw-r--r-- | nss/nsswitch.c | 4 | ||||
| -rw-r--r-- | nss/nsswitch.h | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c index 7b7aadeaab..b06467225b 100644 --- a/nss/nss_files/files-hosts.c +++ b/nss/nss_files/files-hosts.c @@ -86,7 +86,7 @@ LINE_PARSER result->h_length = af == AF_INET ? INADDRSZ : IN6ADDRSZ; /* Store a pointer to the address in the expected form. */ - entdata->h_addr_ptrs[0] = entdata->host_addr; + entdata->h_addr_ptrs[0] = (char *) entdata->host_addr; entdata->h_addr_ptrs[1] = NULL; result->h_addr_list = entdata->h_addr_ptrs; diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 756204bd37..46965fd8ff 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -281,7 +281,7 @@ __nss_lookup_function (service_user *ni, const char *fct_name) enough to a pointer to our structure to use as a lookup key that will be passed to `known_compare' (above). */ - found = __tsearch (&fct_name, (void **) &ni->known, &known_compare); + found = __tsearch (&fct_name, &ni->known, &known_compare); if (*found != &fct_name) /* The search found an existing structure in the tree. */ result = ((known_function *) *found)->fct_ptr; @@ -298,7 +298,7 @@ __nss_lookup_function (service_user *ni, const char *fct_name) remove_from_tree: /* Oops. We can't instantiate this node properly. Remove it from the tree. */ - __tdelete (&fct_name, (void **) &ni->known, &known_compare); + __tdelete (&fct_name, &ni->known, &known_compare); result = NULL; } else diff --git a/nss/nsswitch.h b/nss/nsswitch.h index 96568c69a6..d222e0d443 100644 --- a/nss/nsswitch.h +++ b/nss/nsswitch.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1996-1999,2001,2002,2003,2004 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999,2001,2002,2003,2004,2007 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -66,7 +67,7 @@ typedef struct service_user /* Link to the underlying library object. */ service_library *library; /* Collection of known functions. */ - struct entry *known; + void *known; /* Name of the service (`files', `dns', `nis', ...). */ char name[0]; } service_user; |