From: Martin Schwenke Date: Mon, 22 Sep 2014 10:38:52 +0000 (+1000) Subject: lib/util: Clean up includes for substitute.c X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d92940819f4162985a70f6b2c79032f75f9fce49;p=metze%2Fsamba%2Fwip.git lib/util: Clean up includes for substitute.c Add substitute.h. Allows standalone compiles without external includes.h. Signed-off-by: Martin Schwenke Reviewed-by: Jeremy Allison --- diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h index 0507de66efde..b9ee211a9c1e 100644 --- a/lib/util/samba_util.h +++ b/lib/util/samba_util.h @@ -229,32 +229,7 @@ _PUBLIC_ void hex_encode(const unsigned char *buff_in, size_t len, char **out_he */ _PUBLIC_ char *hex_encode_talloc(TALLOC_CTX *mem_ctx, const unsigned char *buff_in, size_t len); -/** - Substitute a string for a pattern in another string. Make sure there is - enough room! - - This routine looks for pattern in s and replaces it with - insert. It may do multiple replacements. - - Any of " ; ' $ or ` in the insert string are replaced with _ - if len==0 then the string cannot be extended. This is different from the old - use of len==0 which was for no length checks to be done. -**/ -_PUBLIC_ void string_sub(char *s,const char *pattern, const char *insert, size_t len); - -_PUBLIC_ void string_sub_once(char *s, const char *pattern, - const char *insert, size_t len); - -_PUBLIC_ char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s, - const char *pattern, const char *insert); - -/** - Similar to string_sub() but allows for any character to be substituted. - Use with caution! - if len==0 then the string cannot be extended. This is different from the old - use of len==0 which was for no length checks to be done. -**/ -_PUBLIC_ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); +#include "substitute.h" /** Unescape a URL encoded string, in place. diff --git a/lib/util/substitute.c b/lib/util/substitute.c index 30b4e00dc533..70cc441a3210 100644 --- a/lib/util/substitute.c +++ b/lib/util/substitute.c @@ -21,7 +21,10 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "debug.h" +#include "charset/charset.h" +#include "substitute.h" /** * @file diff --git a/lib/util/substitute.h b/lib/util/substitute.h new file mode 100644 index 000000000000..5ba469c52bac --- /dev/null +++ b/lib/util/substitute.h @@ -0,0 +1,56 @@ +/* + Unix SMB/CIFS implementation. + Samba utility functions + + Copyright (C) Andrew Tridgell 1992-2001 + Copyright (C) Simo Sorce 2001-2002 + Copyright (C) Martin Pool 2003 + Copyright (C) James Peach 2005 + + 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 . +*/ + +#ifndef _SAMBA_SUBSTITUTE_H_ +#define _SAMBA_SUBSTITUTE_H_ + +#include + +/** + Substitute a string for a pattern in another string. Make sure there is + enough room! + + This routine looks for pattern in s and replaces it with + insert. It may do multiple replacements. + + Any of " ; ' $ or ` in the insert string are replaced with _ + if len==0 then the string cannot be extended. This is different from the old + use of len==0 which was for no length checks to be done. +**/ +void string_sub(char *s,const char *pattern, const char *insert, size_t len); + +void string_sub_once(char *s, const char *pattern, + const char *insert, size_t len); + +char *string_sub_talloc(TALLOC_CTX *mem_ctx, const char *s, + const char *pattern, const char *insert); + +/** + Similar to string_sub() but allows for any character to be substituted. + Use with caution! + if len==0 then the string cannot be extended. This is different from the old + use of len==0 which was for no length checks to be done. +**/ +void all_string_sub(char *s,const char *pattern,const char *insert, size_t len); + +#endif /* _SAMBA_SUBSTITUTE_H_ */ diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 151c87afdae2..88fb171b4086 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -42,7 +42,7 @@ bld.SAMBA_LIBRARY('samba-util', tevent_debug.c util_process.c memcache.c''', deps='DYNCONFIG time-basic close-low-fd samba-debug tini tiniparser socket-blocking', public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd-daemon', - public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h', + public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h', header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ], local_include=False, vnum='0.0.1',