From 38dc53828e6e9a3ba9589c722fba40a4df167d75 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Wed, 27 Aug 1997 19:27:25 +0000 Subject: doing that irritating compiler clash warning with the protos for standard_sub and standard_sub_basic. again. lkcl (This used to be commit b60ef755cf594ee9751660467709ea4f7a669a2c) --- source3/smbd/server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/smbd') diff --git a/source3/smbd/server.c b/source3/smbd/server.c index aaf62fdcad9..4259bda958b 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -3471,12 +3471,12 @@ void exit_server(char *reason) /**************************************************************************** do some standard substitutions in a string ****************************************************************************/ -void standard_sub(int cnum,char *string) +void standard_sub(int cnum,char *str) { if (VALID_CNUM(cnum)) { char *p, *s, *home; - for ( s=string ; (p=strchr(s, '%')) != NULL ; s=p ) { + for ( s=str ; (p=strchr(s, '%')) != NULL ; s=p ) { switch (*(p+1)) { case 'H' : if ((home = get_home_dir(Connections[cnum].user))!=NULL) string_sub(p,"%H",home); @@ -3492,7 +3492,7 @@ void standard_sub(int cnum,char *string) } } } - standard_sub_basic(string); + standard_sub_basic(str); } /* -- cgit