param: Rename variable used for lp_magicchar magic_char

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 23a70c0481a1e94236d43862a68e591f51755f8a..6421561d70c89e18d4ba5613bdafb98a64f87b8b 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -147,7 +147,7 @@ FN_LOCAL_INTEGER(aio_write_size, aio_write_size)
 FN_LOCAL_INTEGER(map_readonly, map_readonly)
 FN_LOCAL_INTEGER(directory_name_cache_size, directory_name_cache_size)
 FN_LOCAL_INTEGER(smb_encrypt, smb_encrypt)
-FN_LOCAL_PARM_CHAR(magicchar, magic_char)
+FN_LOCAL_PARM_CHAR(magicchar, magicchar)
 FN_LOCAL_STRING(cups_options, szCupsOptions)
 FN_LOCAL_PARM_BOOL(change_notify, bChangeNotify)
 FN_LOCAL_PARM_BOOL(kernel_change_notify, bKernelChangeNotify)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 446c3f63384be261fb8a0ae37473041da2bab32c..507f561d371f28758a3beb783f893a9e7464a8ee 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -2415,7 +2415,7 @@ static struct parm_struct parm_table[] = {
                .label          = "mangling char",
                .type           = P_CHAR,
                .p_class        = P_LOCAL,
-               .offset         = LOCAL_VAR(magic_char),
+               .offset         = LOCAL_VAR(magicchar),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED | FLAG_SHARE | FLAG_GLOBAL,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index a165cdd0066da1a291a8ff981068c77e1d895a35..145eda86f03d28fdb62792bd6c7b818b01dab0a3 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -237,7 +237,7 @@ static struct loadparm_service sDefault =
        .syncalways = false,
        .strict_allocate = false,
        .strict_sync = false,
-       .magic_char = '~',
+       .magicchar = '~',
        .copymap = NULL,
        .delete_readonly = false,
        .fake_oplocks = false,