From b79bcd972cd028a494603f7254d3a266904be2d1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 21 Nov 2009 16:17:16 +0100 Subject: s3: Fix some nonempty blank lines --- source3/lib/substitute.c | 53 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 27 deletions(-) (limited to 'source3/lib/substitute.c') diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index c9dc1d2eb4..55acdd95e3 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -3,17 +3,17 @@ string substitution functions Copyright (C) Andrew Tridgell 1992-2000 Copyright (C) Gerald Carter 2006 - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see . */ @@ -276,12 +276,12 @@ static char * realloc_expand_env_var(char *str, char *p) r = p + 3; copylen = q - r; - + /* reserve space for use later add %$() chars */ if ( (envname = (char *)SMB_MALLOC(copylen + 1 + 4)) == NULL ) { return NULL; } - + strncpy(envname,r,copylen); envname[copylen] = '\0'; @@ -301,7 +301,7 @@ static char * realloc_expand_env_var(char *str, char *p) envname[copylen] = '\0'; r = realloc_string_sub(str, envname, envval); SAFE_FREE(envname); - + return r; } @@ -313,17 +313,17 @@ static char *longvar_domainsid( void ) DOM_SID sid; fstring tmp; char *sid_string; - + if ( !secrets_fetch_domain_sid( lp_workgroup(), &sid ) ) { return NULL; } - + sid_string = SMB_STRDUP( sid_to_fstring( tmp, &sid ) ); - + if ( !sid_string ) { DEBUG(0,("longvar_domainsid: failed to dup SID string!\n")); } - + return sid_string; } @@ -343,15 +343,15 @@ static struct api_longvar longvar_table[] = { static char *get_longvar_val( const char *varname ) { int i; - + DEBUG(7,("get_longvar_val: expanding variable [%s]\n", varname)); - + for ( i=0; longvar_table[i].name; i++ ) { if ( strequal( longvar_table[i].name, varname ) ) { return longvar_table[i].fn(); } } - + return NULL; } @@ -515,13 +515,12 @@ void standard_sub_basic(const char *smb_name, const char *domain_name, char *str, size_t len) { char *s; - + if ( (s = alloc_sub_basic( smb_name, domain_name, str )) != NULL ) { strncpy( str, s, len ); } - + SAFE_FREE( s ); - } /**************************************************************************** @@ -533,7 +532,7 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx, const char *smb_name, const char *domain_name, const char *str) { char *a, *t; - + if ( (a = alloc_sub_basic(smb_name, domain_name, str)) == NULL ) { return NULL; } @@ -555,12 +554,12 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, TALLOC_CTX *tmp_ctx = NULL; /* workaround to prevent a crash while looking at bug #687 */ - + if (!str) { DEBUG(0,("alloc_sub_basic: NULL source string! This should not happen\n")); return NULL; } - + a_string = SMB_STRDUP(str); if (a_string == NULL) { DEBUG(0, ("alloc_sub_basic: Out of memory!\n")); @@ -722,11 +721,11 @@ char *talloc_sub_specified(TALLOC_CTX *mem_ctx, DEBUG(0, ("talloc_sub_specified: Out of memory!\n")); goto done; } - + for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) { - + b = a_string; - + switch (*(p+1)) { case 'U' : a_string = talloc_string_sub( @@ -802,11 +801,11 @@ static char *alloc_sub_advanced(const char *servicename, const char *user, DEBUG(0, ("alloc_sub_advanced: Out of memory!\n")); return NULL; } - + for (b = s = a_string; (p = strchr_m(s, '%')); s = a_string + (p - b)) { - + b = a_string; - + switch (*(p+1)) { case 'N' : a_string = realloc_string_sub(a_string, "%N", automount_server(user)); @@ -830,7 +829,7 @@ static char *alloc_sub_advanced(const char *servicename, const char *user, case 'u': a_string = realloc_string_sub(a_string, "%u", user); break; - + /* Patch from jkf@soton.ac.uk Left the %N (NIS * server name) in standard_sub_basic as it is * a feature for logon servers, hence uses the @@ -842,7 +841,7 @@ static char *alloc_sub_advanced(const char *servicename, const char *user, a_string = realloc_string_sub(a_string, "%p", automount_path(servicename)); break; - + default: break; } -- cgit