param: change s3_param.h from a generated file to a static one

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Change-Id: I131e37ec92f7a826caec382023915c5e4b4c52be
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@samba.org>

diff --git a/lib/param/s3_param.h b/lib/param/s3_param.h
new file mode 100644 (file)
index 0000000..9358617
--- /dev/null
+++ b/lib/param/s3_param.h
@@ -0,0 +1,21 @@
+#ifndef __S3_PARAM_H__
+#define __S3_PARAM_H__
+
+struct loadparm_s3_helpers
+{
+       const char * (*get_parametric)(struct loadparm_service *, const char *type, const char *option);
+       struct parm_struct * (*get_parm_struct)(const char *param_name);
+       void * (*get_parm_ptr)(struct loadparm_service *service, struct parm_struct *parm);
+       struct loadparm_service * (*get_service)(const char *service_name);
+       struct loadparm_service * (*get_default_loadparm_service)(void);
+       struct loadparm_service * (*get_servicebynum)(int snum);
+       int (*get_numservices)(void);
+       bool (*load)(const char *filename);
+       bool (*set_cmdline)(const char *pszParmName, const char *pszParmValue);
+       void (*dump)(FILE *f, bool show_defaults, int maxtoprint);
+       const char * (*dnsdomain)(void);
+       char * (*lp_string)(TALLOC_CTX *ctx, const char *in);
+       struct loadparm_global *globals;
+};
+
+#endif /* __S3_PARAM_H__ */

diff --git a/lib/param/wscript_build b/lib/param/wscript_build
index 256dfcbdd4c582383743187ce9ae6da857dcbbbc..8fe751c4644ad283470cf35e3d9e50b911064a51 100644 (file)
--- a/lib/param/wscript_build
+++ b/lib/param/wscript_build
@@ -18,12 +18,6 @@ bld.SAMBA_GENERATOR('param_local.h',
                     group='build_source',
                     rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=PARAMDEFS --scope=LOCAL')
 
-bld.SAMBA_GENERATOR('s3_param.h',
-                    source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
-                    target='s3_param.h',
-                    group='build_source',
-                    rule='${PYTHON} ${SRC[0].abspath(env)} --file ${SRC[1].abspath(env)} --output ${TGT} --mode=S3PARAM')
-
 bld.SAMBA_GENERATOR('param_global.h',
                     source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
                     target='param_global.h',

diff --git a/script/generate_param.py b/script/generate_param.py
index 8bd2e2b48baa5f4b4f7465a7c41d770a57302313..d79c13c7275eee887015b160d31ab5227d8e62a8 100644 (file)
--- a/script/generate_param.py
+++ b/script/generate_param.py
@@ -35,8 +35,8 @@ parser.add_option("-f", "--file", dest="filename",
                   help="input file", metavar="FILE")
 parser.add_option("-o", "--output", dest="output",
                   help='output file', metavar="FILE")
-parser.add_option("--mode", type="choice", metavar="<FUNCTIONS|S3PROTO|LIBPROTO|PARAMDEFS|S3PARAM>",
-                 choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS", "S3PARAM"], default="FUNCTIONS")
+parser.add_option("--mode", type="choice", metavar="<FUNCTIONS|S3PROTO|LIBPROTO|PARAMDEFS>",
+                 choices=["FUNCTIONS", "S3PROTO", "LIBPROTO", "PARAMDEFS"], default="FUNCTIONS")
 parser.add_option("--scope", metavar="<GLOBAL|LOCAL>",
                   choices = ["GLOBAL", "LOCAL"], default="GLOBAL")
 
@@ -258,33 +258,6 @@ def make_param_defs(path_in, path_out, scope):
     finally:
         file_out.close()
 
-def make_s3_param(path_in, path_out):
-    file_out = open(path_out, 'w')
-    try:
-        file_out.write('/* This file was automatically generated by generate_param.py. DO NOT EDIT */\n\n')
-        header = get_header(path_out)
-        file_out.write("#ifndef %s\n" % header)
-        file_out.write("#define %s\n\n" % header)
-        file_out.write("struct loadparm_s3_helpers\n")
-        file_out.write("{\n")
-        file_out.write("\tconst char * (*get_parametric)(struct loadparm_service *, const char *type, const char *option);\n")
-        file_out.write("\tstruct parm_struct * (*get_parm_struct)(const char *param_name);\n")
-        file_out.write("\tvoid * (*get_parm_ptr)(struct loadparm_service *service, struct parm_struct *parm);\n")
-        file_out.write("\tstruct loadparm_service * (*get_service)(const char *service_name);\n")
-        file_out.write("\tstruct loadparm_service * (*get_default_loadparm_service)(void);\n")
-        file_out.write("\tstruct loadparm_service * (*get_servicebynum)(int snum);\n")
-        file_out.write("\tint (*get_numservices)(void);\n")
-        file_out.write("\tbool (*load)(const char *filename);\n")
-        file_out.write("\tbool (*set_cmdline)(const char *pszParmName, const char *pszParmValue);\n")
-        file_out.write("\tvoid (*dump)(FILE *f, bool show_defaults, int maxtoprint);\n")
-        file_out.write("\tconst char * (*dnsdomain)(void);\n")
-        file_out.write("\tchar * (*lp_string)(TALLOC_CTX *ctx, const char *in);\n")
-        file_out.write("\tstruct loadparm_global *globals;\n")
-        file_out.write("};\n")
-        file_out.write("\n#endif /* %s */\n\n" % header)
-    finally:
-        file_out.close()
-
 if options.mode == 'FUNCTIONS':
     generate_functions(options.filename, options.output)
 elif options.mode == 'S3PROTO':
@@ -293,5 +266,3 @@ elif options.mode == 'LIBPROTO':
     make_lib_proto(options.filename, options.output)
 elif options.mode == 'PARAMDEFS':
     make_param_defs(options.filename, options.output, options.scope)
-elif options.mode == 'S3PARAM':
-    make_s3_param(options.filename, options.output)

diff --git a/source3/param/wscript_build b/source3/param/wscript_build
index 2b3efa49ed7b6f211986e1c3794c3b952875d1e7..6c440f1c7c7bc604e0ad6b002267330afe50f7a7 100644 (file)
--- a/source3/param/wscript_build
+++ b/source3/param/wscript_build
@@ -6,7 +6,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
 
 bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
                      source='loadparm_ctx.c',
-                     deps='''talloc s3_param.h param''')
+                     deps='''talloc param''')
 
 bld.SAMBA_GENERATOR('s3_param_proto_h',
                     source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',