From c821be415b6798d0eaf182e18234513c36d42336 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 23 Jan 2010 18:06:53 +0100 Subject: nsswitch: Make some functions static --- nsswitch/wb_common.c | 12 +++++++----- nsswitch/winbind_client.h | 6 ------ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c index d0dfcb8bbf..f989d194e1 100644 --- a/nsswitch/wb_common.c +++ b/nsswitch/wb_common.c @@ -41,7 +41,8 @@ void winbindd_free_response(struct winbindd_response *response) /* Initialise a request structure */ -void winbindd_init_request(struct winbindd_request *request, int request_type) +static void winbindd_init_request(struct winbindd_request *request, + int request_type) { request->length = sizeof(struct winbindd_request); @@ -61,7 +62,7 @@ static void init_response(struct winbindd_response *response) /* Close established socket */ -void winbind_close_sock(void) +static void winbind_close_sock(void) { if (winbindd_fd != -1) { close(winbindd_fd); @@ -363,7 +364,8 @@ static int winbind_open_pipe_sock(int recursing, int need_priv) /* Write data to winbindd socket */ -int winbind_write_sock(void *buffer, int count, int recursing, int need_priv) +static int winbind_write_sock(void *buffer, int count, int recursing, + int need_priv) { int result, nwritten; @@ -430,7 +432,7 @@ int winbind_write_sock(void *buffer, int count, int recursing, int need_priv) /* Read data from winbindd socket */ -int winbind_read_sock(void *buffer, int count) +static int winbind_read_sock(void *buffer, int count) { int nread = 0; int total_time = 0, selret; @@ -496,7 +498,7 @@ int winbind_read_sock(void *buffer, int count) /* Read reply */ -int winbindd_read_reply(struct winbindd_response *response) +static int winbindd_read_reply(struct winbindd_response *response) { int result1, result2 = 0; diff --git a/nsswitch/winbind_client.h b/nsswitch/winbind_client.h index b004d9c2c0..d4f60a2f9c 100644 --- a/nsswitch/winbind_client.h +++ b/nsswitch/winbind_client.h @@ -1,7 +1,6 @@ #include "winbind_nss_config.h" #include "winbind_struct_protocol.h" -void winbindd_init_request(struct winbindd_request *req,int rq_type); void winbindd_free_response(struct winbindd_response *response); NSS_STATUS winbindd_send_request(int req_type, int need_priv, struct winbindd_request *request); @@ -12,8 +11,6 @@ NSS_STATUS winbindd_request_response(int req_type, NSS_STATUS winbindd_priv_request_response(int req_type, struct winbindd_request *request, struct winbindd_response *response); -int winbindd_read_reply(struct winbindd_response *response); - #define winbind_env_set() \ (strcmp(getenv(WINBINDD_DONT_ENV)?getenv(WINBINDD_DONT_ENV):"0","1") == 0) @@ -23,8 +20,5 @@ int winbindd_read_reply(struct winbindd_response *response); #define winbind_on() \ (setenv(WINBINDD_DONT_ENV, "0", 1) == 0) -int winbind_write_sock(void *buffer, int count, int recursing, int need_priv); -int winbind_read_sock(void *buffer, int count); -void winbind_close_sock(void); const char *nss_err_str(NSS_STATUS ret); -- cgit