From b1c608fe20672fe645cd171e89195b4a00914db1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 28 Sep 2012 13:48:14 -0700 Subject: [PATCH] Avoid more warnings in nsswitch.c --- ChangeLog | 6 ++++-- nss/nsswitch.c | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b04d0..5fcf34d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,9 @@ 2012-09-28 Roland McGrath - * 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 diff --git a/nss/nsswitch.c b/nss/nsswitch.c index 1379553..c0e3e1e 100644 --- a/nss/nsswitch.c +++ b/nss/nsswitch.c @@ -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); -- 2.7.4