system/glibc
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid more warnings in nsswitch.c

Browse Source
This commit is contained in:
Roland McGrath 2012-09-28 13:48:14 -07:00
parent 766ea9371a
commit b1c608fe20
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,7 +1,9 @@
2012-09-28 Roland McGrath <roland@hack.frob.com>
* nss/nsswitch.c (nss_new_service): Conditionalize definition on
[!DO_STATIC_NSS || SHARED], matching its only caller.
* nss/nsswitch.c (nss_new_service): Conditionalize definition and
declaration on [!DO_STATIC_NSS || SHARED], matching its only caller.
(__nss_lookup_function): Conditionalize label remove_from_tree on
[!DO_STATIC_NSS || SHARED], matching its only use.
2012-09-28 David S. Miller <davem@davemloft.net>

4
nss/nsswitch.c
View File

@ -46,8 +46,10 @@ static name_database *nss_parse_file (const char *fname) internal_function;
static name_database_entry *nss_getline (char *line) internal_function;
static service_user *nss_parse_service_list (const char *line)
internal_function;
#if !defined DO_STATIC_NSS || defined SHARED
static service_library *nss_new_service (name_database *database,
const char *name) internal_function;
#endif
/* Declare external database variables. */
@ -433,7 +435,9 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
known_function *known = malloc (sizeof *known);
if (! known)
{
#if !defined DO_STATIC_NSS || defined SHARED
remove_from_tree:
#endif
/* Oops. We can't instantiate this node properly.
Remove it from the tree. */
__tdelete (&fct_name, &ni->known, &known_compare);