diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-19 13:47:38 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:15 +0200 |
| commit | 6f8b2ab54f3eee23f1b63e269f8a5eca02340f09 (patch) | |
| tree | 31984f8b09dc5bdafd0a8190fb308e1930fcda5d /lib/param | |
| parent | c8b499b342c064a940236d2b7bc03f1ca5c24a68 (diff) | |
| download | samba-6f8b2ab54f3eee23f1b63e269f8a5eca02340f09.tar.gz samba-6f8b2ab54f3eee23f1b63e269f8a5eca02340f09.tar.xz samba-6f8b2ab54f3eee23f1b63e269f8a5eca02340f09.zip | |
param: use a single copy_service function in lib/param
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param')
| -rw-r--r-- | lib/param/loadparm.c | 13 | ||||
| -rw-r--r-- | lib/param/param.h | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 809793d3ca1..65378864bbe 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -285,9 +285,6 @@ FN_GLOBAL_CONST_STRING(dnsdomain, dnsdomain) /* local prototypes */ static struct loadparm_service *getservicebyname(struct loadparm_context *lp_ctx, const char *pszServiceName); -static void copy_service(struct loadparm_service *pserviceDest, - const struct loadparm_service *pserviceSource, - struct bitmap *pcopymapDest); static bool lpcfg_service_ok(struct loadparm_service *service); static bool do_section(const char *pszSectionName, void *); static void init_copymap(struct loadparm_service *pservice); @@ -561,7 +558,7 @@ bool lpcfg_parm_bool(struct loadparm_context *lp_ctx, * Set a string value, deallocating any existing space, and allocing the space * for the string */ -bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src) +static bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src) { talloc_free(*dest); @@ -581,7 +578,7 @@ bool lpcfg_string_set(TALLOC_CTX *mem_ctx, char **dest, const char *src) * Set a string value, deallocating any existing space, and allocing the space * for the string */ -bool lpcfg_string_set_upper(TALLOC_CTX *mem_ctx, char **dest, const char *src) +static bool lpcfg_string_set_upper(TALLOC_CTX *mem_ctx, char **dest, const char *src) { talloc_free(*dest); @@ -902,9 +899,9 @@ void set_param_opt(TALLOC_CTX *mem_ctx, * If pcopymapDest is NULL then copy all fields */ -static void copy_service(struct loadparm_service *pserviceDest, - const struct loadparm_service *pserviceSource, - struct bitmap *pcopymapDest) +void copy_service(struct loadparm_service *pserviceDest, + const struct loadparm_service *pserviceSource, + struct bitmap *pcopymapDest) { int i; bool bcopyall = (pcopymapDest == NULL); diff --git a/lib/param/param.h b/lib/param/param.h index 428a2a31c29..0b65a3c8273 100644 --- a/lib/param/param.h +++ b/lib/param/param.h @@ -46,6 +46,7 @@ struct loadparm_service; struct smbcli_options; struct smbcli_session_options; struct gensec_settings; +struct bitmap; #ifdef CONFIG_H_IS_FROM_SAMBA #include "lib/param/param_proto.h" |